From patchwork Tue Oct 25 16:26:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 121743 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 817DD1007D9 for ; Wed, 26 Oct 2011 03:27:38 +1100 (EST) Received: from localhost ([::1]:54450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIjqh-0007VN-6u for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2011 12:27:35 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=e4qFdvGjztgVYSwyN3Ic10HRJHeSVXOc2df5tN6anE8=; b=hngMN+GCkF5E4zFU0MZQuhcQIlAe9PIR5e2olPnunJtehXB+tC/dqMTz7F+fxqpwZj sauGmTsxfMFxh814oI2kr6SQ0vekbjIu9cwYP5qvbyo8ko8RsvufCdXZjd/Cq6DByeuF ha1vNzilZGI5ViEM68ngW4yoj/mKScLYpTgX4= Received: by 10.68.0.136 with SMTP id 8mr58665600pbe.46.1319560043447; Tue, 25 Oct 2011 09:27:23 -0700 (PDT) Received: from localhost.localdomain (93-34-199-98.ip51.fastwebnet.it. [93.34.199.98]) by mx.google.com with ESMTPS id g1sm8350228pbv.2.2011.10.25.09.27.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 09:27:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2011 18:26:58 +0200 Message-Id: <1319560018-25788-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.216.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH] qmp: report TRAY_STATE_CHANGED events 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: 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;