Patchwork qdev: only send deleted event if device was realized

login
register
mail settings
Submitter Anthony Liguori
Date March 27, 2013, 4:36 p.m.
Message ID <1364402174-16580-1-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/231762/
State New
Headers show

Comments

Anthony Liguori - March 27, 2013, 4:36 p.m.
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/qdev.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
Anthony Liguori - April 2, 2013, 8:21 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/hw/qdev.c b/hw/qdev.c
index 9b0f652..e2bb37d 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -767,7 +767,7 @@  static void device_unparent(Object *obj)
     DeviceClass *dc = DEVICE_GET_CLASS(dev);
     BusState *bus;
     QObject *event_data;
-    gchar *path = object_get_canonical_path(obj);
+    bool have_realized = dev->realized;
 
     while (dev->num_child_bus) {
         bus = QLIST_FIRST(&dev->child_bus);
@@ -787,15 +787,20 @@  static void device_unparent(Object *obj)
         dev->parent_bus = NULL;
     }
 
-    if (dev->id) {
-        event_data = qobject_from_jsonf("{ 'device': %s, 'path': %s }",
-                                        dev->id, path);
-    } else {
-        event_data = qobject_from_jsonf("{ 'path': %s }", path);
+    /* Only send event if the device had been completely realized */
+    if (have_realized) {
+        gchar *path = object_get_canonical_path(OBJECT(dev));
+
+        if (dev->id) {
+            event_data = qobject_from_jsonf("{ 'device': %s, 'path': %s }",
+                                            dev->id, path);
+        } else {
+            event_data = qobject_from_jsonf("{ 'path': %s }", path);
+        }
+        monitor_protocol_event(QEVENT_DEVICE_DELETED, event_data);
+        qobject_decref(event_data);
+        g_free(path);
     }
-    monitor_protocol_event(QEVENT_DEVICE_DELETED, event_data);
-    qobject_decref(event_data);
-    g_free(path);
 }
 
 static void device_class_init(ObjectClass *class, void *data)