From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH] Revert "libxl: use correct command line for arm guests." Date: Mon, 26 Oct 2015 11:25:26 +0000 Message-ID: <1445858726-15602-1-git-send-email-ian.jackson@eu.citrix.com> References: <562E0A9D.3060206@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <562E0A9D.3060206@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Julien Grall , Ian Campbell , Ian Jackson , Jan Beulich List-Id: xen-devel@lists.xenproject.org This reverts commit 9befcd335c21818caaf5c5ab764d31a4006d2800. This commit breaks the build: libxl_arm.c: In function 'libxl__arch_domain_init_hw_description': libxl_arm.c:591:76: error: 'state' undeclared (first use in this function) libxl_arm.c:591:76: note: each undeclared identifier is reported only once fo\ r each function it appears in make[3]: *** [libxl_arm.o] Error 1 "state" was introduced in a7511905 "xen: Extend DOMCTL createdomain to support arch configuration". On Julien's recommendation: a7511905 ought not to be backported, so revert this and wait for Ian Campbell to get back. Signed-off-by: Ian Jackson CC: Julien Grall CC: Ian Campbell CC: Jan Beulich --- tools/libxl/libxl_arm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index f89533b..448ac07 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -195,7 +195,6 @@ static int make_root_properties(libxl__gc *gc, } static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, - libxl__domain_build_state *state, const libxl_domain_build_info *info) { int res; @@ -204,9 +203,8 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - if (state->pv_cmdline) { - LOG(DEBUG, "/chosen/bootargs = %s", state->pv_cmdline); - res = fdt_property_string(fdt, "bootargs", state->pv_cmdline); + if (info->cmdline) { + res = fdt_property_string(fdt, "bootargs", info->cmdline); if (res) return res; } @@ -588,7 +586,7 @@ next_resize: FDT( fdt_begin_node(fdt, "") ); FDT( make_root_properties(gc, vers, fdt) ); - FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, state, info) ); + FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, info) ); FDT( make_cpus_node(gc, fdt, info->max_vcpus, ainfo) ); FDT( make_psci_node(gc, fdt) ); -- 1.7.10.4