From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibq-0001Sa-Py for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfibh-0002NM-PR for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:34 -0400 Received: from mail-ig0-x234.google.com ([2607:f8b0:4001:c05::234]:63196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibh-0002NH-Kj for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:25 -0400 Received: by mail-ig0-f180.google.com with SMTP id c1so90272igq.7 for ; Wed, 30 Apr 2014 21:28:25 -0700 (PDT) From: Wenchao Xia Date: Wed, 30 Apr 2014 21:26:51 -0700 Message-Id: <1398918422-3019-18-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> References: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V5 17/28] qapi event: convert DEVICE_DELETED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Signed-off-by: Wenchao Xia --- 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