qdev: correctly send DEVICE_DELETED for recursively-deleted devices

When a device is unparented (i.e. made completely hidden from management)
we want to send a DEVICE_DELETED event only if the device actually was
realized.  This avoids raising DEVICE_DELETED events when device_add
fails.

However, this does not work right for recursively-deleted
devices: the whole tree is _first_ unrealized, _then_ unparented.
Then device_unparent sees realized==false and fails to trigger
the event.  The solution is simply to move have_realized into
the DeviceState struct.  If device_add fails, we never set the
new field to true and DEVICE_DELETED is not sent.

Fixes qemu-iotests testcase 067 (broken by commit 5942a19, though that
commit in turn fixed a possible segfault in the same test).

Reported-by: Markus Armbruster <[email protected]>
Reviewed-by: Markus Armbruster <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index d1eba3cc3d617ff1cf2a8072de66022ca5481ad2..c52041543da72d89f0331e1b1278070f06ed3bcb 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -848,6 +848,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
         if (dev->hotplugged && local_err == NULL) {
             device_reset(dev);
         }
         if (dev->hotplugged && local_err == NULL) {
             device_reset(dev);
         }

+        dev->pending_deleted_event = false;

     } else if (!value && dev->realized) {
         QLIST_FOREACH(bus, &dev->child_bus, sibling) {
             object_property_set_bool(OBJECT(bus), false, "realized",
     } else if (!value && dev->realized) {
         QLIST_FOREACH(bus, &dev->child_bus, sibling) {
             object_property_set_bool(OBJECT(bus), false, "realized",


@@ -862,6 +863,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
         if (dc->unrealize && local_err == NULL) {
             dc->unrealize(dev, &local_err);
         }
         if (dc->unrealize && local_err == NULL) {
             dc->unrealize(dev, &local_err);
         }

+        dev->pending_deleted_event = true;

     }
 
     if (local_err != NULL) {
     }
 
     if (local_err != NULL) {


@@ -972,7 +974,6 @@ static void device_unparent(Object *obj)
 {
     DeviceState *dev = DEVICE(obj);
     BusState *bus;
 {
     DeviceState *dev = DEVICE(obj);
     BusState *bus;

-    bool have_realized = dev->realized;

 
     if (dev->realized) {
         object_property_set_bool(obj, false, "realized", NULL);
 
     if (dev->realized) {
         object_property_set_bool(obj, false, "realized", NULL);


@@ -988,7 +989,7 @@ static void device_unparent(Object *obj)
     }
 
     /* Only send event if the device had been completely realized */
     }
 
     /* Only send event if the device had been completely realized */

-    if (have_realized) {
+    if (dev->pending_deleted_event) {

         gchar *path = object_get_canonical_path(OBJECT(dev));
 
         qapi_event_send_device_deleted(!!dev->id, dev->id, path, &error_abort);
         gchar *path = object_get_canonical_path(OBJECT(dev));
 
         qapi_event_send_device_deleted(!!dev->id, dev->id, path, &error_abort);

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 9221cfc8794ddd78ca8d0902fa934b50e02fab5d..0799ff29b0ce5a87199ba3423a074776c18fd43b 100644 (file)
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -156,6 +156,7 @@ struct DeviceState {
 
     const char *id;
     bool realized;
 
     const char *id;
     bool realized;

+    bool pending_deleted_event;

     QemuOpts *opts;
     int hotplugged;
     BusState *parent_bus;
     QemuOpts *opts;
     int hotplugged;
     BusState *parent_bus;