From patchwork Thu Sep 12 09:15:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 274473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2F73E2C01F0 for ; Thu, 12 Sep 2013 19:16:25 +1000 (EST) Received: from localhost ([::1]:40431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK30g-0007JO-VU for incoming@patchwork.ozlabs.org; Thu, 12 Sep 2013 05:16:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK2zu-0007Gq-2d for qemu-devel@nongnu.org; Thu, 12 Sep 2013 05:15:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VK2zk-0003ik-N6 for qemu-devel@nongnu.org; Thu, 12 Sep 2013 05:15:33 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:44370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK2zj-0003hu-W2 for qemu-devel@nongnu.org; Thu, 12 Sep 2013 05:15:24 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Sep 2013 14:35:43 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 12 Sep 2013 14:35:41 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 08C883940057 for ; Thu, 12 Sep 2013 14:45:05 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8C9FG9v46727418 for ; Thu, 12 Sep 2013 14:45:16 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8C9FHjW007671 for ; Thu, 12 Sep 2013 14:45:17 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r8C9FDVf007408; Thu, 12 Sep 2013 14:45:15 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 12 Sep 2013 17:15:05 +0800 Message-Id: <1378977312-17696-2-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1378977312-17696-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1378977312-17696-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13091209-4790-0000-0000-00000A46EFCD X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 Cc: kwolf@redhat.com, pbonzini@redhat.com, anthony@codemonkey.ws, stefanha@redhat.com, Wenchao Xia Subject: [Qemu-devel] [RFC PATCH 1/8] block: use type MonitorEvent directly 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 block_int.h included monitor.h, so it knows the typedef. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- block.c | 2 +- include/block/block_int.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index a325efc..2e2774d 100644 --- a/block.c +++ b/block.c @@ -1711,7 +1711,7 @@ void bdrv_set_dev_ops(BlockDriverState *bs, const BlockDevOps *ops, } void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv, - enum MonitorEvent ev, + MonitorEvent ev, BlockErrorAction action, bool is_read) { QObject *data; diff --git a/include/block/block_int.h b/include/block/block_int.h index 7c35198..5de45a1 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -315,7 +315,7 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs); int is_windows_drive(const char *filename); #endif void bdrv_emit_qmp_error_event(const BlockDriverState *bdrv, - enum MonitorEvent ev, + MonitorEvent ev, BlockErrorAction action, bool is_read); /**