qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Ben Dooks <qemu@ben.fluff.org>
To: qemu-devel@nongnu.org
Cc: qemu-riscv@nongnu.org, Alistair.Francis@wdc.com,
	peter.maydell@linaro.org, qemu-arm@nongnu.org,
	Ben Dooks <qemu@ben.fluff.org>
Subject: [PATCH v4 4/6] hw/core: use qemu_fdt_setprop_strings()
Date: Tue,  9 Aug 2022 19:56:38 +0100	[thread overview]
Message-ID: <20220809185639.750345-5-qemu@ben.fluff.org> (raw)
In-Reply-To: <20220809185639.750345-1-qemu@ben.fluff.org>

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", &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



  parent reply	other threads:[~2022-08-09 19:14 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-09 18:56 add qemu_fdt_setprop_strings() and use it in most places Ben Dooks
2022-08-09 18:56 ` [PATCH v4 1/6] device_tree: add qemu_fdt_setprop_strings() helper Ben Dooks
2022-08-10 12:19   ` Andrew Jones
2022-08-09 18:56 ` [PATCH v4 2/6] hw/core: don't check return on qemu_fdt_setprop_string_array() Ben Dooks
2022-08-10 12:28   ` Andrew Jones
2022-08-10 21:58   ` Alistair Francis
2022-08-09 18:56 ` [PATCH v4 3/6] hw/riscv: use qemu_fdt_setprop_strings() for string arrays Ben Dooks
2022-08-10 12:34   ` Andrew Jones
2022-08-10 22:02   ` Alistair Francis
2022-08-09 18:56 ` Ben Dooks [this message]
2022-08-10 12:35   ` [PATCH v4 4/6] hw/core: use qemu_fdt_setprop_strings() Andrew Jones
2022-08-10 21:59   ` Alistair Francis
2022-08-09 18:56 ` [PATCH v4 5/6] hw/mips: " Ben Dooks
2022-08-10 12:36   ` Andrew Jones
2022-08-10 22:07   ` Alistair Francis
2022-08-09 18:56 ` [PATCH v4 6/6] hw/arm: change to " Ben Dooks
2022-08-10 12:41   ` Andrew Jones
2022-08-09 19:12 ` add qemu_fdt_setprop_strings() and use it in most places Ben Dooks
2022-08-12 10:30 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220809185639.750345-5-qemu@ben.fluff.org \
    --to=qemu@ben.fluff.org \
    --cc=Alistair.Francis@wdc.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).