From: Ian Jackson <ian.jackson@eu.citrix.com> To: qemu-devel@nongnu.org Cc: Ross Lagerwall <ross.lagerwall@citrix.com>, Anthony PERARD <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, Juergen Gross <jgross@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, Ian Jackson <ian.jackson@eu.citrix.com>, xen-devel@nongnu.org, Ian Jackson <Ian.Jackson@eu.citrix.com> Subject: [Qemu-devel] [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Date: Wed, 4 Oct 2017 17:18:09 +0100 [thread overview] Message-ID: <1507133891-26013-7-git-send-email-ian.jackson@eu.citrix.com> (raw) In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> 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> --- v2: Add compatibility stub for Xen < 4.10. Fix coding style. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- 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 <xentoolcore.h> -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Ian Jackson <ian.jackson@eu.citrix.com> To: qemu-devel@nongnu.org Cc: Juergen Gross <jgross@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, Ian Jackson <Ian.Jackson@eu.citrix.com>, Ross Lagerwall <ross.lagerwall@citrix.com>, Anthony PERARD <anthony.perard@citrix.com>, xen-devel@lists.xenproject.org, xen-devel@nongnu.org Subject: [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Date: Wed, 4 Oct 2017 17:18:09 +0100 [thread overview] Message-ID: <1507133891-26013-7-git-send-email-ian.jackson@eu.citrix.com> (raw) In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> 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> --- v2: Add compatibility stub for Xen < 4.10. Fix coding style. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- 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 <xentoolcore.h> -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-10-04 16:19 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-04 16:18 [Qemu-devel] [PATCH v2 0/*] xen: xen-domid-restrict improvements Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-04 16:18 ` [Qemu-devel] [PATCH 1/8] xen: link against xentoolcore Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-04 16:18 ` [Qemu-devel] [PATCH 2/8] xen: restrict: use xentoolcore_restrict_all Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-04 16:18 ` [Qemu-devel] [PATCH 3/8] xen: defer call to xen_restrict until after os_setup_post Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-09 15:50 ` [Qemu-devel] " Anthony PERARD 2017-10-09 15:50 ` Anthony PERARD 2017-10-09 16:58 ` [Qemu-devel] " Ian Jackson 2017-10-09 16:58 ` Ian Jackson 2017-10-10 11:40 ` [Qemu-devel] " Anthony PERARD 2017-10-10 11:40 ` Anthony PERARD 2017-10-10 17:16 ` [Qemu-devel] " Ian Jackson 2017-10-10 17:16 ` Ian Jackson 2017-10-09 17:00 ` Ian Jackson 2017-10-04 16:18 ` [Qemu-devel] [PATCH 4/8] xen: destroy_hvm_domain: Move reason into a variable Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-04 16:18 ` [Qemu-devel] [PATCH 5/8] xen: move xc_interface compatibility fallback further up the file Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-04 16:18 ` Ian Jackson [this message] 2017-10-04 16:18 ` [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Ian Jackson 2017-10-04 16:18 ` [Qemu-devel] [PATCH 7/8] os-posix: Provide new -runasid option Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-06 12:47 ` [Qemu-devel] " Ross Lagerwall 2017-10-06 12:47 ` Ross Lagerwall 2017-10-06 14:24 ` [Qemu-devel] " Ian Jackson 2017-10-06 14:24 ` Ian Jackson 2017-10-06 14:39 ` Ian Jackson 2017-10-06 12:59 ` [Qemu-devel] " Peter Maydell 2017-10-06 12:59 ` Peter Maydell 2017-10-06 14:24 ` Ian Jackson 2017-10-06 14:24 ` Ian Jackson 2017-10-06 14:39 ` Ian Jackson 2017-10-09 5:46 ` Markus Armbruster 2017-10-09 5:46 ` Markus Armbruster 2017-10-09 15:05 ` Ian Jackson 2017-10-09 15:05 ` Ian Jackson 2017-10-09 15:24 ` Daniel P. Berrange 2017-10-09 15:24 ` Daniel P. Berrange 2017-10-09 16:52 ` Ian Jackson 2017-10-09 16:52 ` Ian Jackson 2017-10-09 16:59 ` Ian Jackson 2017-10-10 7:43 ` Markus Armbruster 2017-10-10 7:43 ` Markus Armbruster 2017-10-10 17:11 ` Ian Jackson 2017-10-10 17:11 ` Ian Jackson 2017-10-11 9:52 ` Ian Jackson 2017-10-09 15:14 ` Ian Jackson 2017-10-04 16:18 ` [Qemu-devel] [PATCH 8/8] RFC configure: do_compiler: Dump some extra info under bash Ian Jackson 2017-10-04 16:18 ` Ian Jackson 2017-10-06 12:58 ` [Qemu-devel] [PATCH v2 0/*] xen: xen-domid-restrict improvements Ross Lagerwall 2017-10-06 12:58 ` Ross Lagerwall 2017-10-06 13:19 ` [Qemu-devel] [Xen-devel] " Paul Durrant 2017-10-06 13:19 ` Paul Durrant 2017-10-10 13:40 ` [Qemu-devel] [Xen-devel] " Ross Lagerwall 2017-10-10 13:40 ` Ross Lagerwall 2017-10-10 17:21 ` [Qemu-devel] [Xen-devel] " Ian Jackson 2017-10-10 17:21 ` Ian Jackson 2017-10-06 14:17 ` [Qemu-devel] " Ian Jackson 2017-10-06 14:17 ` Ian Jackson -- strict thread matches above, loose matches on Subject: below -- 2017-10-19 16:51 [Qemu-devel] [PATCH v5 0/8] " Ian Jackson 2017-10-19 16:51 ` [Qemu-devel] [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Ian Jackson 2017-10-09 16:01 [Qemu-devel] [PATCH v4 0/8] xen: xen-domid-restrict improvements Ian Jackson 2017-10-09 16:01 ` [Qemu-devel] [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Ian Jackson 2017-10-10 11:55 ` Anthony PERARD 2017-10-06 18:27 [Qemu-devel] [PATCH v3 0/8] xen: xen-domid-restrict improvements Ian Jackson 2017-10-06 18:27 ` [Qemu-devel] [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Ian Jackson 2017-10-04 15:53 [Qemu-devel] [PATCH v2 0/7] xen: xen-domid-restrict improvements Ian Jackson 2017-10-04 15:53 ` [Qemu-devel] [PATCH 6/8] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Ian Jackson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1507133891-26013-7-git-send-email-ian.jackson@eu.citrix.com \ --to=ian.jackson@eu.citrix.com \ --cc=anthony.perard@citrix.com \ --cc=jgross@suse.com \ --cc=qemu-devel@nongnu.org \ --cc=ross.lagerwall@citrix.com \ --cc=sstabellini@kernel.org \ --cc=xen-devel@lists.xenproject.org \ --cc=xen-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.