[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 015/102] ppc/pnv.c: fix "system-id" FDT when -uuid is set
From: |
Cédric Le Goater |
Subject: |
[PULL 015/102] ppc/pnv.c: fix "system-id" FDT when -uuid is set |
Date: |
Wed, 15 Dec 2021 18:02:30 +0100 |
From: Daniel Henrique Barboza <danielhb413@gmail.com>
Setting -uuid in the pnv machine does not work:
./qemu-system-ppc64 -machine powernv8,accel=tcg -uuid
7ff61ca1-a4a0-4bc1-944c-abd114a35e80
qemu-system-ppc64: error creating device tree: (fdt_property_string(fdt,
"system-id", buf)): FDT_ERR_BADSTATE
This happens because we're using fdt_property_string(), which is a
sequential write function that is supposed to be used when we're
building a new FDT, in a case where read/writing into an existing FDT.
Fix it by using fdt_setprop_string() instead.
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20211207094858.744386-1-danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/ppc/pnv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index e5b87e873095..44ae41a9cb6b 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -522,7 +522,7 @@ static void *pnv_dt_create(MachineState *machine)
buf = qemu_uuid_unparse_strdup(&qemu_uuid);
_FDT((fdt_setprop_string(fdt, 0, "vm,uuid", buf)));
if (qemu_uuid_set) {
- _FDT((fdt_property_string(fdt, "system-id", buf)));
+ _FDT((fdt_setprop_string(fdt, 0, "system-id", buf)));
}
g_free(buf);
--
2.31.1
- [PULL 004/102] test/tcg/ppc64le: test mtfsf, (continued)
- [PULL 004/102] test/tcg/ppc64le: test mtfsf, Cédric Le Goater, 2021/12/15
- [PULL 008/102] target/ppc: Implement Vector Mask Move insns, Cédric Le Goater, 2021/12/15
- [PULL 010/102] ivshmem-test.c: enable test_ivshmem_server for ppc64 arch, Cédric Le Goater, 2021/12/15
- [PULL 011/102] pci-host: Allow extended config space access for PowerNV PHB4 model, Cédric Le Goater, 2021/12/15
- [PULL 012/102] docs: Minor updates on the powernv documentation., Cédric Le Goater, 2021/12/15
- [PULL 013/102] ppc/pnv.c: add a friendly warning when accel=kvm is used, Cédric Le Goater, 2021/12/15
- [PULL 013/102] ppc/pnv.c: add a friendly warning when accel=kvm is used, Cédric Le Goater, 2021/12/15
- [PULL 014/102] docs/system/ppc/powernv.rst: document KVM support status, Cédric Le Goater, 2021/12/15
- [PULL 018/102] docs: Rename ppc-spapr-hcalls.txt to ppc-spapr-hcalls.rst., Cédric Le Goater, 2021/12/15
- [PULL 019/102] Link new ppc-spapr-hcalls.rst file to pseries.rst., Cédric Le Goater, 2021/12/15
- [PULL 015/102] ppc/pnv.c: fix "system-id" FDT when -uuid is set,
Cédric Le Goater <=
- [PULL 016/102] docs: Introducing pseries documentation., Cédric Le Goater, 2021/12/15
- [PULL 026/102] softfloat: Add flag specific to signaling nans, Cédric Le Goater, 2021/12/15
- [PULL 021/102] softfloat: Add flag specific to Inf - Inf, Cédric Le Goater, 2021/12/15
- [PULL 023/102] softfloat: Add flags specific to Inf / Inf and 0 / 0, Cédric Le Goater, 2021/12/15
- [PULL 025/102] softfloat: Add flag specific to convert non-nan to int, Cédric Le Goater, 2021/12/15
- [PULL 027/102] target/ppc: Update float_invalid_op_addsub for new flags, Cédric Le Goater, 2021/12/15
- [PULL 022/102] softfloat: Add flag specific to Inf * 0, Cédric Le Goater, 2021/12/15
- [PULL 017/102] docs: rSTify ppc-spapr-hcalls.txt, Cédric Le Goater, 2021/12/15
- [PULL 028/102] target/ppc: Update float_invalid_op_mul for new flags, Cédric Le Goater, 2021/12/15
- [PULL 037/102] target/ppc: Update fmadd for new flags, Cédric Le Goater, 2021/12/15