[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [Xen-staging] [xen staging] ARM: parse separate DT properties for different commandlines
On Thu, 2013-09-19 at 10:44 +0100, Julien Grall wrote: > > On 19 Sep 2013 09:29, "Andre Przywara" <andre.przywara@xxxxxxxxxx> > wrote: > >> > >>> @@ -261,7 +261,12 @@ const char *device_tree_bootargs(const void > *fdt) > >>> if ( node < 0 ) > >>> return NULL; > >>> > >>> - prop = fdt_get_property(fdt, node, "bootargs", NULL); > >>> + prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); > >>> + if ( prop == NULL ) > >>> + { > >>> + if (fdt_get_property(fdt, node, "xen,dom0-bootargs", > NULL)) > >>> + prop = fdt_get_property(fdt, node, "bootargs", NULL); > >>> + } > > The logic seems wrong here, we returns bootargs only if the property > "xen,dom0-bootargs" exists. We should also check if the user give the > dom0 > command line via the multiboot module. Anyone investigating this? I've just been using the following, which is obviously bogus! commit ae37a08fa4776ba8ca3bd5554d7c042e8502fa95 Author: Ian Campbell <ijc@xxxxxxxxxxxxxx> Date: Fri Sep 20 23:45:34 2013 +0100 HACK: bootargs fixup diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 27ee708..d66e392 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -252,7 +252,7 @@ const char *device_tree_bootargs(const void *fdt) prop = fdt_get_property(fdt, node, "xen,xen-bootargs", NULL); if ( prop == NULL ) { - if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL)) + //if (fdt_get_property(fdt, node, "xen,dom0-bootargs", NULL)) prop = fdt_get_property(fdt, node, "bootargs", NULL); } if ( prop == NULL ) _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |