mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call xc_domain_shutdown with the reboot flag when the guest requests a reboot.

Browse Source 
Signed-off-by: John V. Baboval <john.baboval@virtualcomputer.com>
Signed-off-by: Tom Goetz <tom.goetz@virtualcomputer.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
John V. Baboval 2012-05-17 10:33:09 +00:00 committed by Stefano Stabellini
parent a4f1a7589a
commit 180640ea07
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xen_common.h
View File

@ -148,6 +148,6 @@ static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
} }
#endif #endif
void destroy_hvm_domain(void); void destroy_hvm_domain(bool reboot);
#endif /* QEMU_HW_XEN_COMMON_H */ #endif /* QEMU_HW_XEN_COMMON_H */

18
xen-all.c
View File

@ -860,7 +860,7 @@ static void cpu_handle_ioreq(void *opaque)
"data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n", "data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
req->state, req->data_is_ptr, req->addr, req->state, req->data_is_ptr, req->addr,
req->data, req->count, req->size); req->data, req->count, req->size);
destroy_hvm_domain(); destroy_hvm_domain(false);
return; return;
} }
@ -874,10 +874,11 @@ static void cpu_handle_ioreq(void *opaque)
*/ */
if (runstate_is_running()) { if (runstate_is_running()) {
if (qemu_shutdown_requested_get()) { if (qemu_shutdown_requested_get()) {
destroy_hvm_domain(); destroy_hvm_domain(false);
} }
if (qemu_reset_requested_get()) { if (qemu_reset_requested_get()) {
qemu_system_reset(VMRESET_REPORT); qemu_system_reset(VMRESET_REPORT);
destroy_hvm_domain(true);
} }
} }
@ -1163,7 +1164,7 @@ int xen_hvm_init(void)
return 0; return 0;
} }
void destroy_hvm_domain(void) void destroy_hvm_domain(bool reboot)
{ {
XenXC xc_handle; XenXC xc_handle;
int sts; int sts;
@ -1172,12 +1173,15 @@ void destroy_hvm_domain(void)
if (xc_handle == XC_HANDLER_INITIAL_VALUE) { if (xc_handle == XC_HANDLER_INITIAL_VALUE) {
fprintf(stderr, "Cannot acquire xenctrl handle\n"); fprintf(stderr, "Cannot acquire xenctrl handle\n");
} else { } else {
sts = xc_domain_shutdown(xc_handle, xen_domid, SHUTDOWN_poweroff); sts = xc_domain_shutdown(xc_handle, xen_domid,
reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff);
if (sts != 0) { if (sts != 0) {
fprintf(stderr, "? xc_domain_shutdown failed to issue poweroff, " fprintf(stderr, "xc_domain_shutdown failed to issue %s, "
"sts %d, %s\n", sts, strerror(errno)); "sts %d, %s\n", reboot ? "reboot" : "poweroff",
sts, strerror(errno));
} else { } else {
fprintf(stderr, "Issued domain %d poweroff\n", xen_domid); fprintf(stderr, "Issued domain %d %s\n", xen_domid,
reboot ? "reboot" : "poweroff");
} }
xc_interface_close(xc_handle); xc_interface_close(xc_handle);
} }