From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vd9SX-0003DL-M6 for qemu-devel@nongnu.org; Sun, 03 Nov 2013 21:00:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vd9SM-0003Nc-VS for qemu-devel@nongnu.org; Sun, 03 Nov 2013 21:00:05 -0500 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:33866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vd9SM-0003ND-9t for qemu-devel@nongnu.org; Sun, 03 Nov 2013 20:59:54 -0500 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Nov 2013 11:59:51 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 54B5F2CE8052 for ; Mon, 4 Nov 2013 12:59:49 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rA41xbeW6881790 for ; Mon, 4 Nov 2013 12:59:37 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rA41xmKT025064 for ; Mon, 4 Nov 2013 12:59:48 +1100 Message-ID: <5276FF96.20702@linux.vnet.ibm.com> Date: Mon, 04 Nov 2013 09:59:50 +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> In-Reply-To: <20131101100231.5c2aa5a5@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, qemu-devel@nongnu.org, armbru@redhat.com, stefanha@redhat.com, pbonzini@redhat.com 于 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? { 'Union': 'QMPEvent', 'base': 'QMPEventBase', 'discriminator': 'event', 'data': { 'SHUTDOWN' : 'EventShutdown', 'POWERDOWN' : 'EventPowerdown', 'RESET' : 'EventReset' } } I used "Event" as union name before, but I am afraid it is too generic, so changed it as QMPEvent. >> QEVENT_SHUTDOWN, >> QEVENT_RESET, >> QEVENT_POWERDOWN, >> @@ -54,11 +54,11 @@ typedef enum MonitorEvent { >> * defining new events here */ >> >> QEVENT_MAX, >> -} MonitorEvent; >> +} QEvent; >> >> int monitor_cur_is_qmp(void); >> >> -void monitor_protocol_event(MonitorEvent event, QObject *data); >> +void monitor_protocol_event(QEvent event, QObject *data); >> void monitor_init(CharDriverState *chr, int flags); >> >> int monitor_suspend(Monitor *mon); >> diff --git a/monitor.c b/monitor.c >> index 74f3f1b..9377834 100644 >> --- a/monitor.c >> +++ b/monitor.c >> @@ -175,7 +175,7 @@ typedef struct MonitorControl { >> * instance. >> */ >> typedef struct MonitorEventState { >> - MonitorEvent event; /* Event being tracked */ >> + QEvent event; /* Event being tracked */ >> int64_t rate; /* Period over which to throttle. 0 to disable */ >> int64_t last; /* Time at which event was last emitted */ >> QEMUTimer *timer; /* Timer for handling delayed events */ >> @@ -517,7 +517,7 @@ QemuMutex monitor_event_state_lock; >> * Emits the event to every monitor instance >> */ >> static void >> -monitor_protocol_event_emit(MonitorEvent event, >> +monitor_protocol_event_emit(QEvent event, >> QObject *data) >> { >> Monitor *mon; >> @@ -536,7 +536,7 @@ monitor_protocol_event_emit(MonitorEvent event, >> * applying any rate limiting if required. >> */ >> static void >> -monitor_protocol_event_queue(MonitorEvent event, >> +monitor_protocol_event_queue(QEvent event, >> QObject *data) >> { >> MonitorEventState *evstate; >> @@ -614,7 +614,7 @@ static void monitor_protocol_event_handler(void *opaque) >> * milliseconds >> */ >> static void >> -monitor_protocol_event_throttle(MonitorEvent event, >> +monitor_protocol_event_throttle(QEvent event, >> int64_t rate) >> { >> MonitorEventState *evstate; >> @@ -650,7 +650,7 @@ static void monitor_protocol_event_init(void) >> * >> * Event-specific data can be emitted through the (optional) 'data' parameter. >> */ >> -void monitor_protocol_event(MonitorEvent event, QObject *data) >> +void monitor_protocol_event(QEvent event, QObject *data) >> { >> QDict *qmp; >> const char *event_name; >> @@ -1067,7 +1067,7 @@ CommandInfoList *qmp_query_commands(Error **errp) >> EventInfoList *qmp_query_events(Error **errp) >> { >> EventInfoList *info, *ev_list = NULL; >> - MonitorEvent e; >> + QEvent e; >> >> for (e = 0 ; e < QEVENT_MAX ; e++) { >> const char *event_name = monitor_event_names[e]; >> diff --git a/stubs/mon-protocol-event.c b/stubs/mon-protocol-event.c >> index 0946e94..e769729 100644 >> --- a/stubs/mon-protocol-event.c >> +++ b/stubs/mon-protocol-event.c >> @@ -1,6 +1,6 @@ >> #include "qemu-common.h" >> #include "monitor/monitor.h" >> >> -void monitor_protocol_event(MonitorEvent event, QObject *data) >> +void monitor_protocol_event(QEvent event, QObject *data) >> { >> } >> diff --git a/ui/vnc.c b/ui/vnc.c >> index 5601cc3..47fda54 100644 >> --- a/ui/vnc.c >> +++ b/ui/vnc.c >> @@ -275,7 +275,7 @@ static void vnc_client_cache_addr(VncState *client) >> client->info = QOBJECT(qdict); >> } >> >> -static void vnc_qmp_event(VncState *vs, MonitorEvent event) >> +static void vnc_qmp_event(VncState *vs, QEvent event) >> { >> QDict *server; >> QObject *data; >