monitor: rename EVENT_* to QEVENT_* to avoid conflict on mingw32

Partially fixes mingw32 build.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/monitor.c b/monitor.c
index 5bf32f0a8e459f8a8193c6efbbc01ac425bd4873..3cb3cf407a57152e8ed1c2744ca3a364bd68d667 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -345,25 +345,25 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
     const char *event_name;
     Monitor *mon = cur_mon;
 
-    assert(event < EVENT_MAX);
+    assert(event < QEVENT_MAX);
 
     if (!monitor_ctrl_mode(mon))
         return;
 
     switch (event) {
-        case EVENT_DEBUG:
+        case QEVENT_DEBUG:
             event_name = "DEBUG";
             break;
-        case EVENT_SHUTDOWN:
+        case QEVENT_SHUTDOWN:
             event_name = "SHUTDOWN";
             break;
-        case EVENT_RESET:
+        case QEVENT_RESET:
             event_name = "RESET";
             break;
-        case EVENT_POWERDOWN:
+        case QEVENT_POWERDOWN:
             event_name = "POWERDOWN";
             break;
-        case EVENT_STOP:
+        case QEVENT_STOP:
             event_name = "STOP";
             break;
         default:

diff --git a/monitor.h b/monitor.h
index 851fd336660508645369c578bb75d00804241a6b..38cc2238a9a062d687a4733a8554a14083d23593 100644 (file)
--- a/monitor.h
+++ b/monitor.h
@@ -15,12 +15,12 @@ extern Monitor *cur_mon;
 
 /* QMP events */
 typedef enum MonitorEvent {
-    EVENT_DEBUG,
-    EVENT_SHUTDOWN,
-    EVENT_RESET,
-    EVENT_POWERDOWN,
-    EVENT_STOP,
-    EVENT_MAX,
+    QEVENT_DEBUG,
+    QEVENT_SHUTDOWN,
+    QEVENT_RESET,
+    QEVENT_POWERDOWN,
+    QEVENT_STOP,
+    QEVENT_MAX,
 } MonitorEvent;
 
 void monitor_protocol_event(MonitorEvent event, QObject *data);

diff --git a/vl.c b/vl.c
index 96ab0202552f93eed489b25af8e0e759e320c1a5..1981e6e744671c8b5e0f1b536568620e6bdf0b37 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4103,11 +4103,11 @@ static void main_loop(void)
         } while (vm_can_run());
 
         if (qemu_debug_requested()) {
-            monitor_protocol_event(EVENT_DEBUG, NULL);
+            monitor_protocol_event(QEVENT_DEBUG, NULL);
             vm_stop(EXCP_DEBUG);
         }
         if (qemu_shutdown_requested()) {
-            monitor_protocol_event(EVENT_SHUTDOWN, NULL);
+            monitor_protocol_event(QEVENT_SHUTDOWN, NULL);
             if (no_shutdown) {
                 vm_stop(0);
                 no_shutdown = 0;
@@ -4115,17 +4115,17 @@ static void main_loop(void)
                 break;
         }
         if (qemu_reset_requested()) {
-            monitor_protocol_event(EVENT_RESET, NULL);
+            monitor_protocol_event(QEVENT_RESET, NULL);
             pause_all_vcpus();
             qemu_system_reset();
             resume_all_vcpus();
         }
         if (qemu_powerdown_requested()) {
-            monitor_protocol_event(EVENT_POWERDOWN, NULL);
+            monitor_protocol_event(QEVENT_POWERDOWN, NULL);
             qemu_irq_raise(qemu_system_powerdown);
         }
         if ((r = qemu_vmstop_requested())) {
-            monitor_protocol_event(EVENT_STOP, NULL);
+            monitor_protocol_event(QEVENT_STOP, NULL);
             vm_stop(r);
         }
     }