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

[Wei Liu <wei.liu2@xxxxxxxxxx>]

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>

> ---
>  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));
>  
>      if (info->device_tree) {
>          LOG(DEBUG, " - Partial device tree provided: %s", info->device_tree);
> -- 
> 2.1.4
> 

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