From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIjqc-0007VH-8C for qemu-devel@nongnu.org; Tue, 25 Oct 2011 12:27:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIjqW-0006pS-Ez for qemu-devel@nongnu.org; Tue, 25 Oct 2011 12:27:30 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:60873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIjqW-0006pM-9j for qemu-devel@nongnu.org; Tue, 25 Oct 2011 12:27:24 -0400 Received: by qadc12 with SMTP id c12so743081qad.4 for ; Tue, 25 Oct 2011 09:27:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 25 Oct 2011 18:26:58 +0200 Message-Id: <1319560018-25788-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] qmp: report TRAY_STATE_CHANGED events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Paolo Bonzini --- QMP/qmp-events.txt | 20 ++++++++++++++++++++ block.c | 9 +++++++++ monitor.c | 3 +++ monitor.h | 1 + 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index 0ce5d4e..242c7a5 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -264,3 +264,23 @@ Example: Note: If action is "reset", "shutdown", or "pause" the WATCHDOG event is followed respectively by the RESET, SHUTDOWN, or STOP events. + + +TRAY_STATE_CHANGED +------------------ + +Emitted when the state of a CD-ROM tray changes. + +Data: + +- "device": device name (json-string) +- "state": state of the tray, one of the following (json-string) + "open": tray is open + "closed": tray is closed + +Example: + +{ "event": "TRAY_STATE_CHANGED", + "data": { "device": "ide0-cd0", + "state": "open" }, + "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } diff --git a/block.c b/block.c index 9873b57..7b0aa62 100644 --- a/block.c +++ b/block.c @@ -2968,10 +2968,19 @@ int bdrv_media_changed(BlockDriverState *bs) void bdrv_eject(BlockDriverState *bs, int eject_flag) { BlockDriver *drv = bs->drv; + QObject *data; if (drv && drv->bdrv_eject) { drv->bdrv_eject(bs, eject_flag); } + + if (*bs->device_name) { + data = qobject_from_jsonf("{ 'device': %s, 'state': %s }", + bs->device_name, + eject_flag ? "open" : "closed"); + monitor_protocol_event(QEVENT_TRAY_STATE_CHANGED, data); + qobject_decref(data); + } } /** diff --git a/monitor.c b/monitor.c index ffda0fe..516a789 100644 --- a/monitor.c +++ b/monitor.c @@ -482,6 +482,9 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) case QEVENT_SPICE_DISCONNECTED: event_name = "SPICE_DISCONNECTED"; break; + case QEVENT_TRAY_STATE_CHANGED: + event_name = "TRAY_STATE_CHANGED"; + break; default: abort(); break; diff --git a/monitor.h b/monitor.h index 4f2d328..b8f4bf7 100644 --- a/monitor.h +++ b/monitor.h @@ -35,6 +35,7 @@ typedef enum MonitorEvent { QEVENT_SPICE_CONNECTED, QEVENT_SPICE_INITIALIZED, QEVENT_SPICE_DISCONNECTED, + QEVENT_TRAY_STATE_CHANGED, QEVENT_MAX, } MonitorEvent; -- 1.7.6.4