From patchwork Thu Aug 28 20:25:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 36261 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f71.google.com (mail-qg0-f71.google.com [209.85.192.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B5350202DD for ; Thu, 28 Aug 2014 20:26:48 +0000 (UTC) Received: by mail-qg0-f71.google.com with SMTP id f51sf5810985qge.2 for ; Thu, 28 Aug 2014 13:26:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=aHLSJuIx371M5mIbTXA8Z33iEDk8yvSGN9azT/2bYvo=; b=SGfZTvZs+YetazJoLECroFPSr52uWAzIcnTz470rpuSbSrmqlGDGxYrgaymd9EXr9K NhLdStf6NfK0jyxMJGApjJgnvMsWi4DZm7S/hG+Z2I3kFgT2alO1oKjuhkG/f0nlpmYG 3Js9op1pERaej2dNwK/ltMZfYK+Nst08LKbWaULqU5/E7mgXYwFNveW6YBb6Fd8B8u0W 9CoknHCLSvE8VSfp9ewycAR0f7oHX3bwCsTQoFXCp064BLLfuqk1yZp8gNbREwvNFG0t q5wptz6BJjgrHfouYFanMFpbczE339W5d9y6cgMwJZahpBk2YB3gG4WFjbyTAnuX0NGF EPpg== X-Gm-Message-State: ALoCoQlI0HVDR787d+RtqTZy7uaFLYn1iOIho1LDeNyUrWDd6bdLdfH/gCILZrgTn2VO7gof/vXD X-Received: by 10.236.126.103 with SMTP id a67mr3496627yhi.4.1409257608504; Thu, 28 Aug 2014 13:26:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.44.119 with SMTP id f110ls336988qga.96.gmail; Thu, 28 Aug 2014 13:26:48 -0700 (PDT) X-Received: by 10.53.10.65 with SMTP id dy1mr3120218vdd.92.1409257608435; Thu, 28 Aug 2014 13:26:48 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id l4si5115398vdh.49.2014.08.28.13.26.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 13:26:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so1507015vcb.11 for ; Thu, 28 Aug 2014 13:26:48 -0700 (PDT) X-Received: by 10.221.5.137 with SMTP id og9mr6359499vcb.18.1409257608283; Thu, 28 Aug 2014 13:26:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp292378vcb; Thu, 28 Aug 2014 13:26:47 -0700 (PDT) X-Received: by 10.52.51.203 with SMTP id m11mr3187454vdo.72.1409257607833; Thu, 28 Aug 2014 13:26:47 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id rx9si5110991vdc.64.2014.08.28.13.26.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 28 Aug 2014 13:26:47 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XN6G8-0001Y3-W9; Thu, 28 Aug 2014 20:25:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XN6G8-0001Xy-12 for xen-devel@lists.xen.org; Thu, 28 Aug 2014 20:25:28 +0000 Received: from [85.158.137.68:31280] by server-15.bemta-3.messagelabs.com id 8D/5F-01573-7309FF35; Thu, 28 Aug 2014 20:25:27 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1409257524!8735918!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7615 invoked from network); 28 Aug 2014 20:25:25 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 28 Aug 2014 20:25:25 -0000 X-IronPort-AV: E=Sophos;i="5.04,420,1406592000"; d="scan'208";a="166176617" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Thu, 28 Aug 2014 16:25:22 -0400 Received: from marilith-n13-p0.uk.xensource.com ([10.80.229.115] helo=localhost.localdomain) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XN6G1-0005XM-O8; Thu, 28 Aug 2014 21:25:22 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Thu, 28 Aug 2014 21:25:21 +0100 From: Ian Campbell To: Date: Thu, 28 Aug 2014 21:25:21 +0100 Message-ID: <5477f99d000d8ade8329b70df5283a5c0bf912c0.1409257521.git.ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , stefano.stabellini@eu.citrix.com, tim@xen.org, julien.grall@linaro.org, ian.jackson@eu.citrix.com, Chunyan Liu Subject: [Xen-devel] [PATCH] tools: (lib)xl: remove stray uses of build_info->u.pv.{kernel, ramdisk, cmdline} X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The commit 11dffa2359e8 "xen: pass kernel initrd to qemu" deprecated these in favour of build_info->{kernel,ramdisk,cmdline} but missed a couple of uses. The ARM case breaks guest boot by omitting the command line from the DTB while the xl SXP one is mostly cosmetic. Signed-off-by: Ian Campbell Cc: Chunyan Liu Reviewed-by: Julien Grall --- tools/libxl/libxl_arm.c | 4 ++-- tools/libxl/xl_sxp.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 3d30242..a122e4a 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -191,8 +191,8 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - if (info->u.pv.cmdline) { - res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (info->cmdline) { + res = fdt_property_string(fdt, "bootargs", info->cmdline); if (res) return res; } diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 48eb608..1c98352 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -144,9 +144,9 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) break; case LIBXL_DOMAIN_TYPE_PV: printf("\t\t(linux %d)\n", 0); - printf("\t\t\t(kernel %s)\n", b_info->u.pv.kernel); - printf("\t\t\t(cmdline %s)\n", b_info->u.pv.cmdline); - printf("\t\t\t(ramdisk %s)\n", b_info->u.pv.ramdisk); + printf("\t\t\t(kernel %s)\n", b_info->kernel); + printf("\t\t\t(cmdline %s)\n", b_info->cmdline); + printf("\t\t\t(ramdisk %s)\n", b_info->ramdisk); printf("\t\t\t(e820_host %s)\n", libxl_defbool_to_string(b_info->u.pv.e820_host)); printf("\t\t)\n");