Re: [Xen-devel] [PATCH 16/16] arm: use /chosen/module1-args for domain 0 command line

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2012-09-06 at 14:58 +0100, Tim Deegan wrote:
> 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.

Actually I hadn't got quite what you were suggesting, and it is a bit
subtle now you put it that way. An else if would probably help the code
be self documenting.

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



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel