From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzmOM-0004d4-I2 for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzmOL-00051d-Kr for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:26 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:9557) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzmOL-0004yD-Bo for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:25 -0400 From: Ian Jackson Date: Wed, 4 Oct 2017 17:18:09 +0100 Message-ID: <1507133891-26013-7-git-send-email-ian.jackson@eu.citrix.com> In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org, Juergen Gross , Stefano Stabellini , Ian Jackson , xen-devel@nongnu.org, Ian Jackson 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 --- v2: Add compatibility stub for Xen < 4.10. Fix coding style. Signed-off-by: Ian Jackson --- hw/i386/xen/xen-hvm.c | 10 ++++++++++ include/hw/xen/xen_common.h | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 83420cd..25b8b14 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -1386,9 +1386,19 @@ 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; + } + 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 8efdb8a..1d6fb57 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 -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Date: Wed, 4 Oct 2017 17:18:09 +0100 Message-ID: <1507133891-26013-7-git-send-email-ian.jackson@eu.citrix.com> References: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzmON-0007AY-6r for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 16:19:27 +0000 In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org, xen-devel@nongnu.org List-Id: xen-devel@lists.xenproject.org eGNfaW50ZXJmYWNlX29wZW4gZXRjLiBpcyBub3QgZ29pbmcgdG8gd29yayBpZiB3ZSBoYXZlIGRy b3BwZWQKcHJpdmlsZWdlLCBidXQgeGVuZGV2aWNlbW9kZWxfc2h1dGRvd24gd2lsbCBpZiBldmVy eXRoaW5nIGlzIG5ldwplbm91Z2guCgp4ZW5kZXZpY2Vtb2RlbF9zaHV0ZG93biBpcyBvbmx5IGF2 YWlsYWJlIGluIFhlbiA0LjEwIGFuZCBsYXRlciwgc28KcHJvdmlkZSBhIHN0dWIgZm9yIGVhcmxp ZXIgdmVyc2lvbnMuCgpTaWduZWQtb2ZmLWJ5OiBJYW4gSmFja3NvbiA8SWFuLkphY2tzb25AZXUu Y2l0cml4LmNvbT4KLS0tCnYyOiBBZGQgY29tcGF0aWJpbGl0eSBzdHViIGZvciBYZW4gPCA0LjEw LgogICAgRml4IGNvZGluZyBzdHlsZS4KClNpZ25lZC1vZmYtYnk6IElhbiBKYWNrc29uIDxJYW4u SmFja3NvbkBldS5jaXRyaXguY29tPgotLS0KIGh3L2kzODYveGVuL3hlbi1odm0uYyAgICAgICB8 IDEwICsrKysrKysrKysKIGluY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCB8ICA3ICsrKysrKysK IDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2h3L2kzODYv eGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1odm0uYwppbmRleCA4MzQyMGNkLi4yNWI4 YjE0IDEwMDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4taHZtLmMKKysrIGIvaHcvaTM4Ni94ZW4v eGVuLWh2bS5jCkBAIC0xMzg2LDkgKzEzODYsMTkgQEAgdm9pZCBkZXN0cm95X2h2bV9kb21haW4o Ym9vbCByZWJvb3QpCiB7CiAgICAgeGNfaW50ZXJmYWNlICp4Y19oYW5kbGU7CiAgICAgaW50IHN0 czsKKyAgICBpbnQgcmM7CiAKICAgICB1bnNpZ25lZCBpbnQgcmVhc29uID0gcmVib290ID8gU0hV VERPV05fcmVib290IDogU0hVVERPV05fcG93ZXJvZmY7CiAKKyAgICBpZiAoeGVuX2Rtb2QpIHsK KyAgICAgICAgcmMgPSB4ZW5kZXZpY2Vtb2RlbF9zaHV0ZG93bih4ZW5fZG1vZCwgeGVuX2RvbWlk LCByZWFzb24pOworICAgICAgICBpZiAoIXJjKSB7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKyAgICAgICAgcGVycm9yKCJ4ZW5kZXZpY2Vtb2RlbF9zaHV0ZG93biBmYWlsZWQiKTsK KyAgICAgICAgLyogd2VsbCwgdHJ5IHRoZSBvbGQgdGhpbmcgdGhlbiAqLworICAgIH0KKwogICAg IHhjX2hhbmRsZSA9IHhjX2ludGVyZmFjZV9vcGVuKDAsIDAsIDApOwogICAgIGlmICh4Y19oYW5k bGUgPT0gTlVMTCkgewogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkNhbm5vdCBhY3F1aXJlIHhl bmN0cmwgaGFuZGxlXG4iKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24u aCBiL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaAppbmRleCA4ZWZkYjhhLi4xZDZmYjU3IDEw MDY0NAotLS0gYS9pbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmgKKysrIGIvaW5jbHVkZS9ody94 ZW4veGVuX2NvbW1vbi5oCkBAIC0xMDgsNiArMTA4LDEzIEBAIHN0YXRpYyBpbmxpbmUgaW50IHhl bnRvb2xjb3JlX3Jlc3RyaWN0X2FsbChkb21pZF90IGRvbWlkKQogICAgIHJldHVybiAtMTsKIH0K IAorc3RhdGljIGlubGluZSBpbnQgeGVuZGV2aWNlbW9kZWxfc2h1dGRvd24oeGVuZGV2aWNlbW9k ZWxfaGFuZGxlICpkbW9kLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZG9taWRfdCBkb21pZCwgdW5zaWduZWQgaW50IHJlYXNvbikKK3sKKyAgICBlcnJubyA9IEVO T1RUWTsKKyAgICByZXR1cm4gLTE7Cit9CisKICNlbHNlIC8qIENPTkZJR19YRU5fQ1RSTF9JTlRF UkZBQ0VfVkVSU0lPTiA+PSA0MTAwMCAqLwogCiAjaW5jbHVkZSA8eGVudG9vbGNvcmUuaD4KLS0g CjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K WGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xp c3RzLnhlbi5vcmcveGVuLWRldmVsCg==