Message ID | 1508506702-17704-4-git-send-email-ian.jackson@eu.citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, 20 Oct 2017, Ian Jackson wrote: > We are going to want to reuse this. > > No functional change. > > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > Reviewed-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org> > --- > hw/i386/xen/xen-hvm.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c > index 7b60ec6..83420cd 100644 > --- a/hw/i386/xen/xen-hvm.c > +++ b/hw/i386/xen/xen-hvm.c > @@ -1387,12 +1387,13 @@ void destroy_hvm_domain(bool reboot) > xc_interface *xc_handle; > int sts; > > + unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff; > + > xc_handle = xc_interface_open(0, 0, 0); > if (xc_handle == NULL) { > fprintf(stderr, "Cannot acquire xenctrl handle\n"); > } else { > - sts = xc_domain_shutdown(xc_handle, xen_domid, > - reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff); > + sts = xc_domain_shutdown(xc_handle, xen_domid, reason); > if (sts != 0) { > fprintf(stderr, "xc_domain_shutdown failed to issue %s, " > "sts %d, %s\n", reboot ? "reboot" : "poweroff", > -- > 2.1.4 >
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 7b60ec6..83420cd 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1387,12 +1387,13 @@ void destroy_hvm_domain(bool reboot) xc_interface *xc_handle; int sts; + unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff; + xc_handle = xc_interface_open(0, 0, 0); if (xc_handle == NULL) { fprintf(stderr, "Cannot acquire xenctrl handle\n"); } else { - sts = xc_domain_shutdown(xc_handle, xen_domid, - reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff); + sts = xc_domain_shutdown(xc_handle, xen_domid, reason); if (sts != 0) { fprintf(stderr, "xc_domain_shutdown failed to issue %s, " "sts %d, %s\n", reboot ? "reboot" : "poweroff",