From patchwork Mon Oct 21 02:16:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 285157 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 D43572C0127 for ; Mon, 21 Oct 2013 21:17:08 +1100 (EST) Received: from localhost ([::1]:39187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYCXq-0004vr-3Z for incoming@patchwork.ozlabs.org; Mon, 21 Oct 2013 06:17:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYCXI-0004tD-Jt for qemu-devel@nongnu.org; Mon, 21 Oct 2013 06:16:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VYCX9-0006wB-6X for qemu-devel@nongnu.org; Mon, 21 Oct 2013 06:16:32 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:57105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYCX8-0006vp-I3 for qemu-devel@nongnu.org; Mon, 21 Oct 2013 06:16:23 -0400 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Oct 2013 15:46:19 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 21 Oct 2013 15:46:16 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id EC4FCE0053 for ; Mon, 21 Oct 2013 15:47:45 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9LAJ38m32243804 for ; Mon, 21 Oct 2013 15:49:04 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9LAGEJe015761 for ; Mon, 21 Oct 2013 15:46:14 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9LAGBDe015445; Mon, 21 Oct 2013 15:46:13 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 21 Oct 2013 10:16:00 +0800 Message-Id: <1382321765-29052-2-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1382321765-29052-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1382321765-29052-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13102110-8256-0000-0000-000009BFAFD4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.5 Cc: kwolf@redhat.com, armbru@redhat.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 1/6] 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 fd05a80..2c15e5d 100644 --- a/block.c +++ b/block.c @@ -1760,7 +1760,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 a48731d..bcc72e2 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -337,7 +337,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); /**