From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sander Eikelenboom Subject: Re: Xen-unstable: "root=" no longer prepended on kernel cmdline since commit "tools: xl: handle unspecified extra= when dealing with root=" Date: Thu, 12 Mar 2015 19:49:51 +0100 Message-ID: <499294981.20150312194951@eikelenboom.it> References: <11710414367.20150312184806@eikelenboom.it> <1426183146.32572.77.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YW8B8-0003Re-2w for xen-devel@lists.xenproject.org; Thu, 12 Mar 2015 18:49:54 +0000 In-Reply-To: <1426183146.32572.77.camel@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: Ian Campbell Cc: Ian Jackson , Wei Liu , xen-devel List-Id: xen-devel@lists.xenproject.org Thursday, March 12, 2015, 6:59:06 PM, you wrote: > On Thu, 2015-03-12 at 18:48 +0100, Sander Eikelenboom wrote: >> Hi Ian, >> >> My PV-guest configs were still using the old "root=" option, >> but these guests don't boot anymore since: >> commit 49ab17a3a615e1ab4ccc46d6942f925cf841df4b, >> "tools: xl: handle unspecified extra= when dealing with root=" >> >> These pv guests don't boot anymore since the "root=" part isn't >> prepended anymore on the kernel commandline, leading to >> a guest kernel that is incapable of finding the root partition. > Bugger, you are of course absolutely correct. > How about this, compile tested only... Works for me, Thanks ! -- Sander > 8<------------- > From fc8eed8083d87608df7b836d89ba058066206b6c Mon Sep 17 00:00:00 2001 > From: Ian Campbell > Date: Thu, 12 Mar 2015 17:56:47 +0000 > Subject: [PATCH] tools: xl: prepend root= to root field on command line with > no extra > This was broken in 49ab17a3a615 "tools: xl: handle unspecified extra= > when dealing with root=". > Reported-by: Sander Eikelenboom > Signed-off-by: Ian Campbell > --- > tools/libxl/xl_cmdimpl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 2c32a96..af5bd87 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -821,7 +821,8 @@ static char *parse_cmdline(XLU_Config *config) > if (asprintf(&cmdline, "root=%s %s", root, extra) == -1) > cmdline = NULL; > } else if (root) { > - cmdline = strdup(root); > + if (asprintf(&cmdline, "root=%s", root) == -1) > + cmdline = NULL; > } else if (extra) { > cmdline = strdup(extra); > }