From patchwork Thu May 1 04:26:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenchao Xia X-Patchwork-Id: 344409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 409C6140115 for ; Thu, 1 May 2014 14:33:26 +1000 (EST) Received: from localhost ([::1]:60352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfigW-0008AU-5N for incoming@patchwork.ozlabs.org; Thu, 01 May 2014 00:33:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibu-0001Zc-VW for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfibl-0002Nr-Mo for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:38 -0400 Received: from mail-ie0-x234.google.com ([2607:f8b0:4001:c03::234]:46649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfibl-0002Nn-I2 for qemu-devel@nongnu.org; Thu, 01 May 2014 00:28:29 -0400 Received: by mail-ie0-f180.google.com with SMTP id as1so3106492iec.11 for ; Wed, 30 Apr 2014 21:28:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eMKk3BgwL73rwm2ZBZveQbqoL+O1pkGMIVxcrqPmKMU=; b=RbHETnzckaV6FjslEztRtDrBL5x5kd4BIRRmmxRU+6V173CBbzVft1UqLtrtIc9ujy tmO2ddFOZJa4DlzbhNQvHEML3q7tVkAlcpNsuv1h8KbUhTHlNM7FtvVst8T5TWpDird5 3QOhwN0N+yM1Ntp4DYZ9nB4Ea2W719P8gMSu4DK63RGLlC5dg3Ki4sPkqoVRLii2khwf YbOECNNXSHEhBLXL/pY0QC8GnC9GJbR5E9WjE5SOuyApPhppT97IQwbn7Y9raj4RzN/v XH+omkurF5o4JetEjcQPFu4CXQvGKlwrqoJdDseLUt/Sa0l06gcaazyJw+QljvqusHc5 YxXg== X-Received: by 10.42.16.199 with SMTP id q7mr7883343ica.16.1398918509137; Wed, 30 Apr 2014 21:28:29 -0700 (PDT) Received: from localhost.localdomain.localdomain ([118.250.93.201]) by mx.google.com with ESMTPSA id ii7sm4626797igb.17.2014.04.30.21.28.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Apr 2014 21:28:28 -0700 (PDT) From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 21:26:52 -0700 Message-Id: <1398918422-3019-19-git-send-email-wenchaoqemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> References: <1398918422-3019-1-git-send-email-wenchaoqemu@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::234 Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, Wenchao Xia , lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH V5 18/28] qapi event: convert DEVICE_TRAY_MOVED 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: Wenchao Xia --- block.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/block.c b/block.c index e9a55bb..dae5d25 100644 --- a/block.c +++ b/block.c @@ -35,6 +35,7 @@ #include "block/qapi.h" #include "qmp-commands.h" #include "qemu/timer.h" +#include "qapi-event.h" #ifdef CONFIG_BSD #include @@ -2068,17 +2069,6 @@ void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv, qobject_decref(data); } -static void bdrv_emit_qmp_eject_event(BlockDriverState *bs, bool ejected) -{ - QObject *data; - - data = qobject_from_jsonf("{ 'device': %s, 'tray-open': %i }", - bdrv_get_device_name(bs), ejected); - monitor_protocol_event(QEVENT_DEVICE_TRAY_MOVED, 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) { @@ -2086,11 +2076,13 @@ static void bdrv_dev_change_media_cb(BlockDriverState *bs, bool load) bs->dev_ops->change_media_cb(bs->dev_opaque, load); if (tray_was_closed) { /* tray open */ - bdrv_emit_qmp_eject_event(bs, true); + qapi_event_send_device_tray_moved(bdrv_get_device_name(bs), + true, NULL); } if (load) { /* tray close */ - bdrv_emit_qmp_eject_event(bs, false); + qapi_event_send_device_tray_moved(bdrv_get_device_name(bs), + false, NULL); } } } @@ -5053,7 +5045,8 @@ void bdrv_eject(BlockDriverState *bs, bool eject_flag) } if (bs->device_name[0] != '\0') { - bdrv_emit_qmp_eject_event(bs, eject_flag); + qapi_event_send_device_tray_moved(bdrv_get_device_name(bs), + eject_flag, NULL); } }