From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdWDF-0000tc-Qa for qemu-devel@nongnu.org; Mon, 04 Nov 2013 21:17:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdWD5-00074M-I0 for qemu-devel@nongnu.org; Mon, 04 Nov 2013 21:17:49 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:56972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdWD4-00073v-UM for qemu-devel@nongnu.org; Mon, 04 Nov 2013 21:17:39 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 5 Nov 2013 07:47:28 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id C82EAE004A for ; Tue, 5 Nov 2013 07:49:11 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rA52HN7w44171444 for ; Tue, 5 Nov 2013 07:47:24 +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 rA52HQoS024189 for ; Tue, 5 Nov 2013 07:47:26 +0530 Message-ID: <52785538.8080103@linux.vnet.ibm.com> Date: Tue, 05 Nov 2013 10:17:28 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1382321765-29052-1-git-send-email-xiawenc@linux.vnet.ibm.com> <1382321765-29052-3-git-send-email-xiawenc@linux.vnet.ibm.com> <20131101100231.5c2aa5a5@redhat.com> <5276FF96.20702@linux.vnet.ibm.com> <20131104083339.79a190ce@redhat.com> In-Reply-To: <20131104083339.79a190ce@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 2/6] qapi: rename MonitorEvent to QEvent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com 于 2013/11/4 21:33, Luiz Capitulino 写道: > On Mon, 04 Nov 2013 09:59:50 +0800 > Wenchao Xia wrote: > >> 于 2013/11/1 22:02, Luiz Capitulino 写道: >>> On Mon, 21 Oct 2013 10:16:01 +0800 >>> Wenchao Xia wrote: >>> >>>> Signed-off-by: Wenchao Xia >>>> --- >>>> block.c | 2 +- >>>> include/block/block_int.h | 2 +- >>>> include/monitor/monitor.h | 6 +++--- >>>> monitor.c | 12 ++++++------ >>>> stubs/mon-protocol-event.c | 2 +- >>>> ui/vnc.c | 2 +- >>>> 6 files changed, 13 insertions(+), 13 deletions(-) >>>> >>>> diff --git a/block.c b/block.c >>>> index 2c15e5d..458a4f8 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, >>>> - MonitorEvent ev, >>>> + QEvent ev, >>>> BlockErrorAction action, bool is_read) >>>> { >>>> QObject *data; >>>> diff --git a/include/block/block_int.h b/include/block/block_int.h >>>> index bcc72e2..bfdaf84 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, >>>> - MonitorEvent ev, >>>> + QEvent ev, >>>> BlockErrorAction action, bool is_read); >>>> >>>> /** >>>> diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h >>>> index 10fa0e3..8b14a6f 100644 >>>> --- a/include/monitor/monitor.h >>>> +++ b/include/monitor/monitor.h >>>> @@ -20,7 +20,7 @@ extern Monitor *default_mon; >>>> #define MONITOR_CMD_ASYNC 0x0001 >>>> >>>> /* QMP events */ >>>> -typedef enum MonitorEvent { >>>> +typedef enum QEvent { >>> >>> Qt has a QEvent class, so QEvent is not a good name for us if we're >>> considering making it public in the schema (which could become an >>> external library in the distant future). >>> >>> I suggest calling it QMPEvent. >>> >> >> Maybe QMPEventType, since QMPEvent should be used an union? > > If we add the 'event' type, like: > > { 'event': 'BLOCK_IO_ERROR', 'data': { ... } } > > Then we don't need an union. > It would bring a little trouble to C code caller, for example the event generate function(just like monitor_protocol_event) would be: event_generate(QMPEvent *e); We may need to make *e as opaque and handly writing code for "switch ", but with union, the generated code would do that for us, so I think union is better.