From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Tue, 7 Sep 2021 00:47:50 +0000 (-0300)
Subject: spapr.c: handle dev->id in spapr_memory_unplug_rollback()
X-Git-Tag: v6.2.0-rc0~80^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44d886abab268043157b08b77147cc29bff22090;p=thirdparty%2Fqemu.git

spapr.c: handle dev->id in spapr_memory_unplug_rollback()

As done in hw/acpi/memory_hotplug.c, pass an empty string if dev->id
is NULL to qapi_event_send_mem_unplug_error() to avoid relying on
a behavior that can be changed in the future.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20210907004755.424931-3-danielhb413@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d39fd4e6449..ac11c8a7287 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3690,7 +3690,7 @@ void spapr_memory_unplug_rollback(SpaprMachineState *spapr, DeviceState *dev)
      */
     qapi_error = g_strdup_printf("Memory hotunplug rejected by the guest "
                                  "for device %s", dev->id);
-    qapi_event_send_mem_unplug_error(dev->id, qapi_error);
+    qapi_event_send_mem_unplug_error(dev->id ? : "", qapi_error);
 }
 
 /* Callback to be called during DRC release. */