[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED |
Date: |
Wed, 30 Apr 2014 21:26:51 -0700 |
Signed-off-by: Wenchao Xia <address@hidden>
---
hw/core/qdev.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 60f9df1..ac85eaf 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -32,8 +32,8 @@
#include "qapi/qmp/qerror.h"
#include "qapi/visitor.h"
#include "qapi/qmp/qjson.h"
-#include "monitor/monitor.h"
#include "hw/hotplug.h"
+#include "qapi-event.h"
int qdev_hotplug = 0;
static bool qdev_hot_added = false;
@@ -874,7 +874,6 @@ static void device_unparent(Object *obj)
{
DeviceState *dev = DEVICE(obj);
BusState *bus;
- QObject *event_data;
bool have_realized = dev->realized;
if (dev->realized) {
@@ -894,14 +893,7 @@ static void device_unparent(Object *obj)
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);
+ qapi_event_send_device_deleted(!!dev->id, dev->id, path, NULL);
g_free(path);
}
}
--
1.7.1
- Re: [Qemu-devel] [PATCH V5 07/28] qapi event: convert SHUTDOWN, (continued)
- [Qemu-devel] [PATCH V5 09/28] qapi event: convert RESET, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 08/28] qapi event: convert POWERDOWN, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 10/28] qapi event: convert STOP, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 11/28] qapi event: convert RESUME, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 12/28] qapi event: convert SUSPEND, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 13/28] qapi event: convert SUSPEND_DISK, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 14/28] qapi event: convert WAKEUP, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 15/28] qapi event: convert RTC_CHANGE, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 16/28] qapi event: convert WATCHDOG, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED,
Wenchao Xia <=
- [Qemu-devel] [PATCH V5 18/28] qapi event: convert DEVICE_TRAY_MOVED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 19/28] qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 20/28] qapi event: convert BLOCK_IMAGE_CORRUPTED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 21/28] qapi event: convert other BLOCK_JOB events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 22/28] qapi event: convert NIC_RX_FILTER_CHANGED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 23/28] qapi event: convert VNC events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 24/28] qapi event: convert SPICE events, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 25/28] qapi event: convert BALLOON_CHANGE, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 26/28] qapi event: convert GUEST_PANICKED, Wenchao Xia, 2014/05/01
- [Qemu-devel] [PATCH V5 27/28] qapi event: convert QUORUM events, Wenchao Xia, 2014/05/01