From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 6 Apr 2018 09:33:58 +0000 (+0100)
Subject: Revert "tools/libxl: Fix build following c/s 74fd984ae"
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~211
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=115fb8e345b9377b400b9e2e9bca1750362d284b;p=xen.git

Revert "tools/libxl: Fix build following c/s 74fd984ae"

This reverts commit d96f17f50c621be30e5c73da9317c91d8cbbf3e1.

It doesn't fix the build.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c
index 177c6b745c..fbe8786a8e 100644
--- a/tools/libxl/libxl_arm.c
+++ b/tools/libxl/libxl_arm.c
@@ -846,6 +846,9 @@ 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;
 
@@ -854,8 +857,7 @@ 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(info->arch_arm.gic_version));
+    LOG(DEBUG, " - vGIC version: %s", gicv_to_string(xc_config->gic_version));
 
     if (info->device_tree) {
         LOG(DEBUG, " - Partial device tree provided: %s", info->device_tree);