qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Bin Meng <bmeng.cn@gmail.com>
To: Alistair Francis <Alistair.Francis@wdc.com>,
	qemu-devel@nongnu.org, qemu-riscv@nongnu.org
Cc: Bin Meng <bin.meng@windriver.com>
Subject: [PATCH 2/8] hw/riscv: virt: Switch to use qemu_fdt_setprop_string_array() helper
Date: Tue, 30 Mar 2021 01:08:12 +0800	[thread overview]
Message-ID: <20210329170818.23139-2-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20210329170818.23139-1-bmeng.cn@gmail.com>

From: Bin Meng <bin.meng@windriver.com>

Since commit 78da6a1bca22 ("device_tree: add qemu_fdt_setprop_string_array helper"),
we can use the new helper to set the compatible strings for the
SiFive test device node.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---

 hw/riscv/virt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index c0dc69ff33..5d0c1e5903 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -395,8 +395,9 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap,
         (long)memmap[VIRT_TEST].base);
     qemu_fdt_add_subnode(fdt, name);
     {
-        const char compat[] = "sifive,test1\0sifive,test0\0syscon";
-        qemu_fdt_setprop(fdt, name, "compatible", compat, sizeof(compat));
+        const char *compat[3] = { "sifive,test1", "sifive,test0", "syscon" };
+        qemu_fdt_setprop_string_array(fdt, name, "compatible", (char **)&compat,
+                                      ARRAY_SIZE(compat));
     }
     qemu_fdt_setprop_cells(fdt, name, "reg",
         0x0, memmap[VIRT_TEST].base,
-- 
2.25.1



  reply	other threads:[~2021-03-29 17:18 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-29 17:08 [PATCH 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper Bin Meng
2021-03-29 17:08 ` Bin Meng [this message]
2021-03-31 15:41   ` [PATCH 2/8] hw/riscv: virt: " Alistair Francis
2021-03-29 17:08 ` [PATCH 3/8] hw/riscv: Support the official CLINT DT bindings Bin Meng
2021-03-31 15:42   ` Alistair Francis
2021-03-29 17:08 ` [PATCH 4/8] hw/riscv: Support the official PLIC " Bin Meng
2021-03-31 15:43   ` Alistair Francis
2021-03-29 17:08 ` [PATCH 5/8] docs/system/riscv: Correct the indentation level of supported devices Bin Meng
2021-03-31 15:44   ` Alistair Francis
2021-03-29 17:08 ` [PATCH 6/8] docs/system/riscv: sifive_u: Document '-dtb' usage Bin Meng
2021-03-31 15:46   ` Alistair Francis
2021-03-29 17:08 ` [PATCH 7/8] hw/riscv: Use macros for BIOS image names Bin Meng
2021-03-31 15:44   ` Alistair Francis
2021-03-29 17:08 ` [PATCH 8/8] hw/riscv: microchip_pfsoc: Support direct kernel boot Bin Meng
2021-03-31 15:50   ` Alistair Francis
2021-03-31 15:40 ` [PATCH 1/8] hw/riscv: sifive_u: Switch to use qemu_fdt_setprop_string_array() helper Alistair Francis
2021-03-31 16:07 ` Richard Henderson

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=20210329170818.23139-2-bmeng.cn@gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=Alistair.Francis@wdc.com \
    --cc=bin.meng@windriver.com \
    --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).