From patchwork Tue Feb 7 18:09:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 139992 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1B53B71AA for ; Wed, 8 Feb 2012 05:51:41 +1100 (EST) Received: from localhost ([::1]:59614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RupUv-0005df-9N for incoming@patchwork.ozlabs.org; Tue, 07 Feb 2012 13:10:33 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RupUh-0005V5-2r for qemu-devel@nongnu.org; Tue, 07 Feb 2012 13:10:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RupUY-0003fs-0C for qemu-devel@nongnu.org; Tue, 07 Feb 2012 13:10:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RupUX-0003fQ-IL for qemu-devel@nongnu.org; Tue, 07 Feb 2012 13:10:09 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q17IA8HZ032451 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 7 Feb 2012 13:10:08 -0500 Received: from localhost (ovpn-116-74.ams2.redhat.com [10.36.116.74]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q17IA6pR006569; Tue, 7 Feb 2012 13:10:07 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 7 Feb 2012 16:09:49 -0200 Message-Id: <1328638189-9534-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1328638189-9534-1-git-send-email-lcapitulino@redhat.com> References: <1328638189-9534-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, eblake@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 5/5] qmp: add the BLOCK_MEDIUM_CHANGED event X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Luiz Capitulino --- QMP/qmp-events.txt | 17 +++++++++++++++++ block.c | 12 ++++++++++++ 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 ab32e62..a1815b5 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -26,6 +26,23 @@ Example: Note: If action is "stop", a STOP event will eventually follow the BLOCK_IO_ERROR event. +BLOCK_MEDIUM_CHANGED +-------------------- + +Emitted when a medium is either inserted or removed from a drive. This should +happen as a result of the 'eject' and 'change' commands. + +Data: + +- "device": device name (json-string) +- "medium-inserted": true if a medium has been inserted, false if it has been + removed from the drive + +{ "event": "BLOCK_MEDIUM_CHANGED", + "data": { "device": "ide1-cd1", + "medium-inserted": true }, + "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } + GUEST_MEDIUM_EJECTED -------------------- diff --git a/block.c b/block.c index 7f5b56d..1d40f82 100644 --- a/block.c +++ b/block.c @@ -941,10 +941,22 @@ void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops, } } +static void bdrv_emit_qmp_medium_changed_event(BlockDriverState *bs, bool load) +{ + QObject *data; + + data = qobject_from_jsonf("{ 'device': %s, 'medium-inserted': %i }", + bdrv_get_device_name(bs), load); + monitor_protocol_event(QEVENT_BLOCK_MEDIUM_CHANGED, data); + + qobject_decref(data); +} + static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load) { if (bs->dev_ops && bs->dev_ops->change_media_cb) { bs->dev_ops->change_media_cb(bs->dev_opaque, load); + bdrv_emit_qmp_medium_changed_event(bs, load); } } diff --git a/monitor.c b/monitor.c index 48b1dea..8701ec1 100644 --- a/monitor.c +++ b/monitor.c @@ -488,6 +488,9 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) case QEVENT_GUEST_MEDIUM_EJECTED: event_name = "GUEST_MEDIUM_EJECTED"; break; + case QEVENT_BLOCK_MEDIUM_CHANGED: + event_name = "BLOCK_MEDIUM_CHANGED"; + break; default: abort(); break; diff --git a/monitor.h b/monitor.h index 06be7bb..4f9e6f7 100644 --- a/monitor.h +++ b/monitor.h @@ -39,6 +39,7 @@ typedef enum MonitorEvent { QEVENT_BLOCK_JOB_COMPLETED, QEVENT_BLOCK_JOB_CANCELLED, QEVENT_GUEST_MEDIUM_EJECTED, + QEVENT_BLOCK_MEDIUM_CHANGED, QEVENT_MAX, } MonitorEvent;