Re: [Xen-devel] [PATCH] tools/libxl: Fix build following c/s 74fd984ae

[Juergen Gross <jgross@xxxxxxxx>]

On 06/04/18 11:03, Julien Grall wrote:
> Hi,
> 
> On 04/06/2018 09:00 AM, Wei Liu wrote:
>> On Thu, Apr 05, 2018 at 07:54:26PM +0100, Andrew Cooper wrote:
>>> c/s 74fd984ae "tools/libxl: Drop xc_domain_configuration_t from
>>> libxl__domain_build_state" removed state->config completely, but the GIC
>>> version is available in info.  Use the up-to-date version.
>>>
>>> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
>>> ---
>>> CC: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
>>> CC: Wei Liu <wei.liu2@xxxxxxxxxx>
>>> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
>>> CC: Julien Grall <julien.grall@xxxxxxx>
>>> CC: Juergen Gross <jgross@xxxxxxxx>
>>>
>>> Completely untested.  I don't even have a compile environment to hand, which
>>> is how this got missed before.  Sorry.
>>
>> Looks correct to me:
>>
>> Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> 
> Sadly libxl still does not compile on ARM:
> 
> libxl_arm.c: In function 'libxl__prepare_dtb':
> libxl_arm.c:923:17: error: 'xc_config' undeclared (first use in this 
> function); did you mean 'yajl_config'?
>          switch (xc_config->gic_version) {
>                  ^~~~~~~~~
>                  yajl_config
> libxl_arm.c:923:17: note: each undeclared identifier is reported only once 
> for each function it appears in
> 
>>
>>> ---
>>>   tools/libxl/libxl_arm.c | 6 ++----
>>>   1 file changed, 2 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
>>> index fbe8786..177c6b7 100644
>>> --- a/tools/libxl/libxl_arm.c
>>> +++ b/tools/libxl/libxl_arm.c
>>> @@ -846,9 +846,6 @@ static int libxl__prepare_dtb(libxl__gc *gc, 
>>> libxl_domain_build_info *info,
>>>       const libxl_version_info *vers;
>>>       const struct arch_info *ainfo;
>>>   
>>> -    /* convenience aliases */
>>> -    xc_domain_configuration_t *xc_config = &state->config;
>>> -
>>>       vers = libxl_get_version_info(CTX);
>>>       if (vers == NULL) return ERROR_FAIL;
>>>   
>>> @@ -857,7 +854,8 @@ static int libxl__prepare_dtb(libxl__gc *gc, 
>>> libxl_domain_build_info *info,
>>>   
>>>       LOG(DEBUG, "constructing DTB for Xen version %d.%d guest",
>>>           vers->xen_version_major, vers->xen_version_minor);
>>> -    LOG(DEBUG, " - vGIC version: %s", 
>>> gicv_to_string(xc_config->gic_version));
>>> +    LOG(DEBUG, " - vGIC version: %s",
>>> +        gicv_to_string(info->arch_arm.gic_version));
> 
> This is wrong. gicv_to_string works on XEN_DOMCTL_* define and not the 
> LIBXL_GIC_*.
> So this will not give the right output.
> 
> I would suggest to revert that patch and I will send one that actually fix 
> the compilation.
> Not sure I would be able to do it today thought.

Fine with me.


Juergen


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel