From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tim Deegan <tim@xen.org>
Subject: Re: [PATCH 16/16] arm: use /chosen/module1-args for
	domain 0 command line
Date: Thu, 6 Sep 2012 14:58:48 +0100
Message-ID: <20120906135848.GA59973@ocelot.phlegethon.org>
References: <1346678886.32462.9.camel@zakaz.uk.xensource.com>
	<1346679056-8108-16-git-send-email-ian.campbell@citrix.com>
	<20120906135020.GO56463@ocelot.phlegethon.org>
	<1346939700.30018.15.camel@zakaz.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <1346939700.30018.15.camel@zakaz.uk.xensource.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org>
List-Id: xen-devel@lists.xenproject.org

At 14:55 +0100 on 06 Sep (1346943300), Ian Campbell wrote:
> > >          if ( device_tree_node_matches(fdt, node, "chosen") )
> > >          {
> > >              if ( strcmp(prop_name, "bootargs") == 0 )
> > >                  continue;
> > > -            if ( strcmp(prop_name, "xen,dom0-bootargs") == 0 )
> > > +            if ( strcmp(prop_name, "module1-args") == 0 )
> > > +            {
> > >                  prop_name = "bootargs";
> > > +                had_mod1_args = 1;
> > > +            }
> > > +            if ( strncmp(prop_name, "module", strlen("module")) == 0 )
> > > +                 continue;
> > 
> > ITYM "else if" here, or the module1-args property gets dropped too,
> > doesn't it?  
> 
> The intention was to filter "module*" from the DTB altogether, since
> they were intended for Xen not dom0. All that should remain is
> module1-args which has been renamed to bootargs which is what dom0
> expects.

Argh, of course now prop_name's been clobbered it won't be filtered. :)
Sorry for the noise.

Acked-by: Tim Deegan <tim@xen.org>, though I imagine you'll want
David's ack rather than mine.

Tim.