qdev: only send deleted event if device was realized
Reported-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-id: 1364402174-16580-1-git-send-email-aliguori@us.ibm.com
This commit is contained in:
parent
8f0605cc9c
commit
b1ee58290d
23
hw/qdev.c
23
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)
|
||||
|
Loading…
Reference in New Issue
Block a user