diff mbox

[5/6] qapi: remove var monitor_event_names[]

Message ID 1382321765-29052-6-git-send-email-xiawenc@linux.vnet.ibm.com
State New
Headers show

Commit Message

Wayne Xia Oct. 21, 2013, 2:16 a.m. UTC 
Use the generated table in qapi-types.h.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
 monitor.c |   36 ++----------------------------------
 1 files changed, 2 insertions(+), 34 deletions(-)

Comments

Eric Blake Oct. 21, 2013, 8:47 p.m. UTC | #1 
On 10/21/2013 03:16 AM, Wenchao Xia wrote:
> Use the generated table in qapi-types.h.
> 
> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
> ---
>  monitor.c |   36 ++----------------------------------
>  1 files changed, 2 insertions(+), 34 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

(but may change if you rebase things to avoid churn in 3/5)

> @@ -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));
> 

Remember this spot in patch 6/6...
diff mbox

Patch

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));