From 1dfb4dd993f7122353fb2894f09dfcba894cd7d5 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 29 Jul 2011 14:26:33 -0300 Subject: Replace the VMSTOP macros with a proper state type Today, when notifying a VM state change with vm_state_notify(), we pass a VMSTOP macro as the 'reason' argument. This is not ideal because the VMSTOP macros tell why qemu stopped and not exactly what the current VM state is. One example to demonstrate this problem is that vm_start() calls vm_state_notify() with reason=0, which turns out to be VMSTOP_USER. This commit fixes that by replacing the VMSTOP macros with a proper state type called RunState. Signed-off-by: Luiz Capitulino --- xen-all.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'xen-all.c') diff --git a/xen-all.c b/xen-all.c index 1bc2c3c8de..b119817f30 100644 --- a/xen-all.c +++ b/xen-all.c @@ -846,7 +846,8 @@ static void xen_main_loop_prepare(XenIOState *state) /* Initialise Xen */ -static void xen_change_state_handler(void *opaque, int running, int reason) +static void xen_change_state_handler(void *opaque, int running, + RunState state) { if (running) { /* record state running */ @@ -854,11 +855,12 @@ static void xen_change_state_handler(void *opaque, int running, int reason) } } -static void xen_hvm_change_state_handler(void *opaque, int running, int reason) +static void xen_hvm_change_state_handler(void *opaque, int running, + RunState rstate) { - XenIOState *state = opaque; + XenIOState *xstate = opaque; if (running) { - xen_main_loop_prepare(state); + xen_main_loop_prepare(xstate); } } -- cgit v1.2.1