From patchwork Mon Oct 21 02:16:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 285162 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 CD7662C00D1 for ; Mon, 21 Oct 2013 21:20:05 +1100 (EST) Received: from localhost ([::1]:39210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYCah-0001xC-A9 for incoming@patchwork.ozlabs.org; Mon, 21 Oct 2013 06:20:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYCXP-0004tm-71 for qemu-devel@nongnu.org; Mon, 21 Oct 2013 06:16:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VYCXF-0006xB-MM for qemu-devel@nongnu.org; Mon, 21 Oct 2013 06:16:39 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:39429) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYCXE-0006wp-VI for qemu-devel@nongnu.org; Mon, 21 Oct 2013 06:16:29 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Oct 2013 15:46:25 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 21 Oct 2013 15:46:23 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 74500E0055 for ; Mon, 21 Oct 2013 15:47:52 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9LAJBG116580830 for ; Mon, 21 Oct 2013 15:49:11 +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 r9LAGKMH016228 for ; Mon, 21 Oct 2013 15:46:21 +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 r9LAGBDi015445; Mon, 21 Oct 2013 15:46:19 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Mon, 21 Oct 2013 10:16:04 +0800 Message-Id: <1382321765-29052-6-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-4790-0000-0000-00000AE7FBE4 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, armbru@redhat.com, lcapitulino@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 5/6] qapi: remove var monitor_event_names[] 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 Use the generated table in qapi-types.h. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- monitor.c | 36 ++---------------------------------- 1 files changed, 2 insertions(+), 34 deletions(-) diff --git a/monitor.c b/monitor.c index b2c64de..7b8bd5e 100644 --- a/monitor.c +++ b/monitor.c @@ -478,38 +478,6 @@ static void timestamp_put(QDict *qdict) } -static const char *monitor_event_names[] = { - [Q_EVENT_SHUTDOWN] = "SHUTDOWN", - [Q_EVENT_RESET] = "RESET", - [Q_EVENT_POWERDOWN] = "POWERDOWN", - [Q_EVENT_STOP] = "STOP", - [Q_EVENT_RESUME] = "RESUME", - [Q_EVENT_VNC_CONNECTED] = "VNC_CONNECTED", - [Q_EVENT_VNC_INITIALIZED] = "VNC_INITIALIZED", - [Q_EVENT_VNC_DISCONNECTED] = "VNC_DISCONNECTED", - [Q_EVENT_BLOCK_IO_ERROR] = "BLOCK_IO_ERROR", - [Q_EVENT_RTC_CHANGE] = "RTC_CHANGE", - [Q_EVENT_WATCHDOG] = "WATCHDOG", - [Q_EVENT_SPICE_CONNECTED] = "SPICE_CONNECTED", - [Q_EVENT_SPICE_INITIALIZED] = "SPICE_INITIALIZED", - [Q_EVENT_SPICE_DISCONNECTED] = "SPICE_DISCONNECTED", - [Q_EVENT_BLOCK_JOB_COMPLETED] = "BLOCK_JOB_COMPLETED", - [Q_EVENT_BLOCK_JOB_CANCELLED] = "BLOCK_JOB_CANCELLED", - [Q_EVENT_BLOCK_JOB_ERROR] = "BLOCK_JOB_ERROR", - [Q_EVENT_BLOCK_JOB_READY] = "BLOCK_JOB_READY", - [Q_EVENT_DEVICE_DELETED] = "DEVICE_DELETED", - [Q_EVENT_DEVICE_TRAY_MOVED] = "DEVICE_TRAY_MOVED", - [Q_EVENT_NIC_RX_FILTER_CHANGED] = "NIC_RX_FILTER_CHANGED", - [Q_EVENT_SUSPEND] = "SUSPEND", - [Q_EVENT_SUSPEND_DISK] = "SUSPEND_DISK", - [Q_EVENT_WAKEUP] = "WAKEUP", - [Q_EVENT_BALLOON_CHANGE] = "BALLOON_CHANGE", - [Q_EVENT_SPICE_MIGRATE_COMPLETED] = "SPICE_MIGRATE_COMPLETED", - [Q_EVENT_GUEST_PANICKED] = "GUEST_PANICKED", - [Q_EVENT_BLOCK_IMAGE_CORRUPTED] = "BLOCK_IMAGE_CORRUPTED", -}; -QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != Q_EVENT_MAX) - MonitorEventState monitor_event_state[Q_EVENT_MAX]; QemuMutex monitor_event_state_lock; @@ -657,7 +625,7 @@ void monitor_protocol_event(QEvent event, QObject *data) assert(event < Q_EVENT_MAX); - event_name = monitor_event_names[event]; + event_name = QEvent_lookup[event]; assert(event_name != NULL); qmp = qdict_new(); @@ -1070,7 +1038,7 @@ EventInfoList *qmp_query_events(Error **errp) QEvent e; for (e = 0 ; e < Q_EVENT_MAX ; e++) { - const char *event_name = monitor_event_names[e]; + const char *event_name = QEvent_lookup[e]; assert(event_name != NULL); info = g_malloc0(sizeof(*info)); info->value = g_malloc0(sizeof(*info->value));