On 06/09/2023 10:42, Jan Beulich wrote:
>
>
> On 06.09.2023 10:36, Michal Orzel wrote:
>> main_dt_overlay() makes a call to libxl_dt_overlay() which is for now
>> only compiled for Arm. This causes the build failure as reported by
>> gitlab CI and OSSTEST. Fix it by guarding the function, prototype and
>> entry in cmd_table[] using LIBXL_HAVE_DT_OVERLAY. This has an advantage
>> over regular Arm guard so that the code will not need to be modified again
>> if other architecture gain support for this feature.
>>
>> Fixes: 61765a07e3d8 ("tools/xl: Add new xl command overlay for device tree
>> overlay support")
>> Reported-by: Jan Beulich <[email protected]>
>> Signed-off-by: Michal Orzel <[email protected]>
>> ---
>> There are still other parts of dt overlay support in toolstack that would
>> want to be revisited in order to use guards suitable to be used by other
>> arches.
>
> Since from all I can tell this will do
> Reviewed-by: Jan Beulich <[email protected]>
>
> But I still wonder: We agreed to leave libxc alone for now, but was it
> really intentional that you didn't adjust libxl.h right here, but instead
> ...
>
>> --- a/tools/xl/xl.h
>> +++ b/tools/xl/xl.h
>> @@ -138,7 +138,9 @@ int main_shutdown(int argc, char **argv);
>> int main_reboot(int argc, char **argv);
>> int main_list(int argc, char **argv);
>> int main_vm_list(int argc, char **argv);
>> +#ifdef LIBXL_HAVE_DT_OVERLAY
>> int main_dt_overlay(int argc, char **argv);
>> +#endif
>> int main_create(int argc, char **argv);
>> int main_config_update(int argc, char **argv);
>> int main_button_press(int argc, char **argv);
>
> ... made this adjustment, which imo isn't strictly necessary.
I'm not a toolstack expert but I decided to guard the prototype as well
given that quite a few of them are guarded either using LIBXL_HAVE or arch
guard.
~Michal
