Re: [PATCH] ppc/pvn.c: fix "system-id" FDT when -uuid is set

[Cédric Le Goater]

On 12/6/21 13:45, Daniel Henrique Barboza wrote:

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" to retrieve a
"system-id" attribute that does not exist, instead of using
fdt_setprop_string() to create a "system-id" attribute with the uuid
provided via command line.

Signed-off-by: Daniel Henrique Barboza <danielhb...@gmail.com>

Reviewed-by: Cédric Le Goater <c...@kaod.org>

---

Cedric,

This isn't critical and probably not worth postponing 7.0 for one
more week, but since we're pushing MIPS fixes for 6.2 I believe this
one can also go in.

As you said, it is not critical :) and 6.2 is due for tomorrow !

Let's take it for 7.0.

Thanks,

C.

  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 32ab8071a4..9e532caa9f 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -552,7 +552,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);