OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

Partially fixes mingw32 build.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-12-04 18:05:45 +00:00
parent 31a68d5766
commit 242cd0030a
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monitor.c
View File

@ -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:

12
monitor.h
View File

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

10
vl.c
View File

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