[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] xen: destroy_hvm_domain: Try xendevicemodel_s
From: |
Ian Jackson |
Subject: |
[Qemu-devel] [PATCH 06/11] xen: destroy_hvm_domain: Try xendevicemodel_shutdown |
Date: |
Thu, 8 Mar 2018 17:39:12 +0000 |
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 <address@hidden>
Reviewed-by: Anthony PERARD <address@hidden>
---
v6: Do not print message about harmless condition in ENOTTY case.
v2: Add compatibility stub for Xen < 4.10.
Fix coding style.
Signed-off-by: Ian Jackson <address@hidden>
---
hw/i386/xen/xen-hvm.c | 11 +++++++++++
include/hw/xen/xen_common.h | 7 +++++++
2 files changed, 18 insertions(+)
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 3590d99..b95748d 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -1386,9 +1386,20 @@ 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");
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 60c4ebb..4bd30a3 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -108,6 +108,13 @@ static inline int xentoolcore_restrict_all(domid_t domid)
return -1;
}
+static inline int xendevicemodel_shutdown(xendevicemodel_handle *dmod,
+ domid_t domid, unsigned int reason)
+{
+ errno = ENOTTY;
+ return -1;
+}
+
#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 41000 */
#include <xentoolcore.h>
--
2.1.4
- [Qemu-devel] [PATCH v6 00/11] xen: xen-domid-restrict improvements, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 09/11] xen: Use newly added dmops for mapping VGA memory, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 05/11] xen: move xc_interface compatibility fallback further up the file, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 01/11] xen: link against xentoolcore, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 10/11] xen: Expect xenstore write to fail when restricted, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 04/11] xen: destroy_hvm_domain: Move reason into a variable, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 08/11] configure: do_compiler: Dump some extra info under bash, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 07/11] os-posix: Provide new -runas <uid>:<gid> facility, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 06/11] xen: destroy_hvm_domain: Try xendevicemodel_shutdown,
Ian Jackson <=
- [Qemu-devel] [PATCH 11/11] scripts/get_maintainer.pl: Print proper error message for missing $file, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 02/11] xen: restrict: use xentoolcore_restrict_all, Ian Jackson, 2018/03/08
- [Qemu-devel] [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post, Ian Jackson, 2018/03/08