| Message ID | 20220809185639.750345-5-qemu@ben.fluff.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,1/6] device_tree: add qemu_fdt_setprop_strings() helper | expand |
On Tue, Aug 09, 2022 at 07:56:38PM +0100, Ben Dooks wrote: > Change to using the qemu_fdt_setprop_strings() helper in > hw/core code. > > Signed-off-by: Ben Dooks <qemu@ben.fluff.org> > --- > hw/core/guest-loader.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c > index c61ebc4144..7b8e32e06f 100644 > --- a/hw/core/guest-loader.c > +++ b/hw/core/guest-loader.c > @@ -56,18 +56,15 @@ static void loader_insert_platform_data(GuestLoaderState *s, int size, > qemu_fdt_setprop(fdt, node, "reg", ®_attr, sizeof(reg_attr)); > > if (s->kernel) { > - const char *compat[2] = { "multiboot,module", "multiboot,kernel" }; > - qemu_fdt_setprop_string_array(fdt, node, "compatible", > - (char **) &compat, > - ARRAY_SIZE(compat)); > + qemu_fdt_setprop_strings(fdt, node, "compatible", > + "multiboot,module", "multiboot,kernel"); > + > if (s->args) { > qemu_fdt_setprop_string(fdt, node, "bootargs", s->args); > } > } else if (s->initrd) { > - const char *compat[2] = { "multiboot,module", "multiboot,ramdisk" }; > - qemu_fdt_setprop_string_array(fdt, node, "compatible", > - (char **) &compat, > - ARRAY_SIZE(compat)); > + qemu_fdt_setprop_strings(fdt, node, "compatible", > + "multiboot,module", "multiboot,ramdisk"); > } > } > > -- > 2.35.1 > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
On Wed, Aug 10, 2022 at 5:13 AM Ben Dooks <qemu@ben.fluff.org> wrote: > > Change to using the qemu_fdt_setprop_strings() helper in > hw/core code. > > Signed-off-by: Ben Dooks <qemu@ben.fluff.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/core/guest-loader.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c > index c61ebc4144..7b8e32e06f 100644 > --- a/hw/core/guest-loader.c > +++ b/hw/core/guest-loader.c > @@ -56,18 +56,15 @@ static void loader_insert_platform_data(GuestLoaderState *s, int size, > qemu_fdt_setprop(fdt, node, "reg", ®_attr, sizeof(reg_attr)); > > if (s->kernel) { > - const char *compat[2] = { "multiboot,module", "multiboot,kernel" }; > - qemu_fdt_setprop_string_array(fdt, node, "compatible", > - (char **) &compat, > - ARRAY_SIZE(compat)); > + qemu_fdt_setprop_strings(fdt, node, "compatible", > + "multiboot,module", "multiboot,kernel"); > + > if (s->args) { > qemu_fdt_setprop_string(fdt, node, "bootargs", s->args); > } > } else if (s->initrd) { > - const char *compat[2] = { "multiboot,module", "multiboot,ramdisk" }; > - qemu_fdt_setprop_string_array(fdt, node, "compatible", > - (char **) &compat, > - ARRAY_SIZE(compat)); > + qemu_fdt_setprop_strings(fdt, node, "compatible", > + "multiboot,module", "multiboot,ramdisk"); > } > } > > -- > 2.35.1 > >
diff --git a/hw/core/guest-loader.c b/hw/core/guest-loader.c index c61ebc4144..7b8e32e06f 100644 --- a/hw/core/guest-loader.c +++ b/hw/core/guest-loader.c @@ -56,18 +56,15 @@ static void loader_insert_platform_data(GuestLoaderState *s, int size, qemu_fdt_setprop(fdt, node, "reg", ®_attr, sizeof(reg_attr)); if (s->kernel) { - const char *compat[2] = { "multiboot,module", "multiboot,kernel" }; - qemu_fdt_setprop_string_array(fdt, node, "compatible", - (char **) &compat, - ARRAY_SIZE(compat)); + qemu_fdt_setprop_strings(fdt, node, "compatible", + "multiboot,module", "multiboot,kernel"); + if (s->args) { qemu_fdt_setprop_string(fdt, node, "bootargs", s->args); } } else if (s->initrd) { - const char *compat[2] = { "multiboot,module", "multiboot,ramdisk" }; - qemu_fdt_setprop_string_array(fdt, node, "compatible", - (char **) &compat, - ARRAY_SIZE(compat)); + qemu_fdt_setprop_strings(fdt, node, "compatible", + "multiboot,module", "multiboot,ramdisk"); } }
Change to using the qemu_fdt_setprop_strings() helper in hw/core code. Signed-off-by: Ben Dooks <qemu@ben.fluff.org> --- hw/core/guest-loader.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)