diff options
| author | Ian Jackson | 2017-09-15 18:51:52 +0200 |
|---|---|---|
| committer | Ian Jackson | 2018-04-26 17:29:51 +0200 |
| commit | 6b47c2aa780c98cea7a39cbe36c30d3923e5163e (patch) | |
| tree | 9c4ee3ba8a9019ae279a7a067a65e46b4f4e0ac5 /hw/i386/xen | |
| parent | xen: move xc_interface compatibility fallback further up the file (diff) | |
| download | qemu-6b47c2aa780c98cea7a39cbe36c30d3923e5163e.tar.gz qemu-6b47c2aa780c98cea7a39cbe36c30d3923e5163e.tar.xz qemu-6b47c2aa780c98cea7a39cbe36c30d3923e5163e.zip | |
xen: destroy_hvm_domain: Try xendevicemodel_shutdown
xc_interface_open etc. is not going to work if we have dropped
privilege, but xendevicemodel_shutdown will if everything is new
enough.
xendevicemodel_shutdown is only availabe in Xen 4.10 and later, so
provide a stub for earlier versions.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Diffstat (limited to 'hw/i386/xen')
| -rw-r--r-- | hw/i386/xen/xen-hvm.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 3590d99934..fb727bc6c2 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1386,9 +1386,21 @@ void destroy_hvm_domain(bool reboot) { xc_interface *xc_handle; int sts; + int rc; unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff; + if (xen_dmod) { + rc = xendevicemodel_shutdown(xen_dmod, xen_domid, reason); + if (!rc) { + return; + } + if (errno != ENOTTY /* old Xen */) { + perror("xendevicemodel_shutdown failed"); + } + /* well, try the old thing then */ + } + xc_handle = xc_interface_open(0, 0, 0); if (xc_handle == NULL) { fprintf(stderr, "Cannot acquire xenctrl handle\n"); |