diff options
Diffstat (limited to 'xen-all.c')
| -rw-r--r-- | xen-all.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xen-all.c b/xen-all.c index 84420d83a9..b5e28abd40 100644 --- a/xen-all.c +++ b/xen-all.c @@ -620,7 +620,7 @@ static void cpu_ioreq_move(ioreq_t *req) } } } else { - target_ulong tmp; + uint64_t tmp; if (req->dir == IOREQ_READ) { for (i = 0; i < req->count; i++) { @@ -736,7 +736,7 @@ static void cpu_handle_ioreq(void *opaque) * guest resumes and does a hlt with interrupts disabled which * causes Xen to powerdown the domain. */ - if (vm_running) { + if (runstate_is_running()) { if (qemu_shutdown_requested_get()) { destroy_hvm_domain(); } @@ -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); } } |