[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED |
Date: |
Mon, 23 Jun 2014 12:36:25 -0400 |
From: Wenchao Xia <address@hidden>
Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
docs/qmp/qmp-events.txt | 18 ------------------
hw/core/qdev.c | 12 ++----------
qapi-event.json | 16 ++++++++++++++++
3 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index 8efc8df..1792c0c 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -168,24 +168,6 @@ Example:
Note: The "ready to complete" status is always reset by a BLOCK_JOB_ERROR
event.
-DEVICE_DELETED
---------------
-
-Emitted whenever the device removal completion is acknowledged
-by the guest.
-At this point, it's safe to reuse the specified device ID.
-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",
- "path": "/machine/peripheral/virtio-net-pci-0" },
- "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
-
DEVICE_TRAY_MOVED
-----------------
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index b9cd4fc..d1eba3c 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -32,9 +32,9 @@
#include "qapi/qmp/qerror.h"
#include "qapi/visitor.h"
#include "qapi/qmp/qjson.h"
-#include "monitor/monitor.h"
#include "hw/hotplug.h"
#include "hw/boards.h"
+#include "qapi-event.h"
int qdev_hotplug = 0;
static bool qdev_hot_added = false;
@@ -972,7 +972,6 @@ static void device_unparent(Object *obj)
{
DeviceState *dev = DEVICE(obj);
BusState *bus;
- QObject *event_data;
bool have_realized = dev->realized;
if (dev->realized) {
@@ -992,14 +991,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, &error_abort);
g_free(path);
}
}
diff --git a/qapi-event.json b/qapi-event.json
index e7dbfab..c880d77 100644
--- a/qapi-event.json
+++ b/qapi-event.json
@@ -106,3 +106,19 @@
##
{ 'event': 'WATCHDOG',
'data': { 'action': 'WatchdogExpirationAction' } }
+
+##
+# @DEVICE_DELETED
+#
+# Emitted whenever the device removal completion is acknowledged by the guest.
+# At this point, it's safe to reuse the specified device ID. Device removal can
+# be initiated by the guest or by HMP/QMP commands.
+#
+# @device: #optional, device name
+#
+# @path: device path
+#
+# Since: 1.5
+##
+{ 'event': 'DEVICE_DELETED',
+ 'data': { '*device': 'str', 'path': 'str' } }
--
1.9.3
- [Qemu-devel] [PULL 33/43] qmp: convert ACPI_DEVICE_OST event, (continued)
- [Qemu-devel] [PULL 33/43] qmp: convert ACPI_DEVICE_OST event, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 35/43] qapi event: convert GUEST_PANICKED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 36/43] qapi event: convert QUORUM events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 38/43] qemu-char: introduce qemu_chr_alloc, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 40/43] qemu-char: move pty_chr_update_read_handler around, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 05/43] qapi: Suppress unwanted space between type and identifier, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 41/43] qemu-char: make writes thread-safe, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_type(), Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 10/43] qapi script: add event support, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED,
Luiz Capitulino <=
- [Qemu-devel] [PULL 16/43] qapi event: convert POWERDOWN, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 29/43] qapi event: convert other BLOCK_JOB events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 09/43] qapi: add event helper functions, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 19/43] qapi event: convert RESUME, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 42/43] monitor: protect outbuf and mux_out with mutex, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 21/43] qapi event: convert SUSPEND_DISK, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 24/43] qapi event: convert WATCHDOG, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 39/43] qemu-char: do not call chr_write directly, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 37/43] qapi event: clean up, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 43/43] monitor: protect event emission, Luiz Capitulino, 2014/06/23