[libvirt] [PATCH v6 3/3] qmp: add path to device_deleted event

Add QOM path to device deleted event. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com&gt; --- QMP/qmp-events.txt | 4 +++- hw/qdev.c | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index 24cf3e8..dcc826d 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -147,9 +147,11 @@ Device removal can be initiated by the guest or by HMP/QMP commands. Data: - "device": device name (json-string, optional) +- "path": device path (json-string) { "event": "DEVICE_DELETED", - "data": { "device": "virtio-net-pci-0" }, + "data": { "device": "virtio-net-pci-0", + "path": "/machine/peripheral/virtio-net-pci-0" }, "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } DEVICE_TRAY_MOVED diff --git a/hw/qdev.c b/hw/qdev.c index 50bf2e6..2c861c1 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -782,14 +782,13 @@ static void device_unparent(Object *obj, const char *path) } if (dev->id) { - event_data = qobject_from_jsonf("{ 'device': %s }", dev->id); + event_data = qobject_from_jsonf("{ 'device': %s, 'path': %s }", + dev->id, path); } else { - event_data = NULL; + event_data = qobject_from_jsonf("{ 'path': %s }", path); } monitor_protocol_event(QEVENT_DEVICE_DELETED, event_data); - if (event_data) { - qobject_decref(event_data); - } + qobject_decref(event_data); } static void device_class_init(ObjectClass *class, void *data) -- MST