From: Ian Jackson <ian.jackson@eu.citrix.com> To: qemu-devel@nongnu.org Cc: xen-devel@lists.xenproject.org, Ross Lagerwall <ross.lagerwall@citrix.com>, Anthony PERARD <anthony.perard@citrix.com>, Juergen Gross <jgross@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, Ian Jackson <ian.jackson@eu.citrix.com> Subject: [Qemu-devel] [PATCH 10/11] xen: Expect xenstore write to fail when restricted Date: Thu, 8 Mar 2018 17:39:16 +0000 [thread overview] Message-ID: <1520530757-4477-11-git-send-email-ian.jackson@eu.citrix.com> (raw) In-Reply-To: <1520530757-4477-1-git-send-email-ian.jackson@eu.citrix.com> From: Ross Lagerwall <ross.lagerwall@citrix.com> Saving the current state to xenstore may fail when running restricted (in particular, after a migration). Therefore, don't report the error or exit when running restricted. Toolstacks that want to allow running QEMU restricted should instead make use of QMP events to listen for state changes. CC: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> Reviewed-by: Ian Jackson <ian.jackson@eu.citrix.com> --- v6: New patch in this version of the series --- hw/xen/xen-common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index f73b416..8ede246 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -101,7 +101,12 @@ static void xenstore_record_dm_state(struct xs_handle *xs, const char *state) } snprintf(path, sizeof (path), "device-model/%u/state", xen_domid); - if (!xs_write(xs, XBT_NULL, path, state, strlen(state))) { + /* + * This call may fail when running restricted so don't make it fatal in + * that case. Toolstacks should instead use QMP to listen for state changes. + */ + if (!xs_write(xs, XBT_NULL, path, state, strlen(state)) && + !xen_domid_restrict) { error_report("error recording dm state"); exit(1); } -- 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 Subject: [PATCH 10/11] xen: Expect xenstore write to fail when restricted Date: Thu, 8 Mar 2018 17:39:16 +0000 [thread overview] Message-ID: <1520530757-4477-11-git-send-email-ian.jackson@eu.citrix.com> (raw) In-Reply-To: <1520530757-4477-1-git-send-email-ian.jackson@eu.citrix.com> From: Ross Lagerwall <ross.lagerwall@citrix.com> Saving the current state to xenstore may fail when running restricted (in particular, after a migration). Therefore, don't report the error or exit when running restricted. Toolstacks that want to allow running QEMU restricted should instead make use of QMP events to listen for state changes. CC: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> Reviewed-by: Ian Jackson <ian.jackson@eu.citrix.com> --- v6: New patch in this version of the series --- hw/xen/xen-common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index f73b416..8ede246 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -101,7 +101,12 @@ static void xenstore_record_dm_state(struct xs_handle *xs, const char *state) } snprintf(path, sizeof (path), "device-model/%u/state", xen_domid); - if (!xs_write(xs, XBT_NULL, path, state, strlen(state))) { + /* + * This call may fail when running restricted so don't make it fatal in + * that case. Toolstacks should instead use QMP to listen for state changes. + */ + if (!xs_write(xs, XBT_NULL, path, state, strlen(state)) && + !xen_domid_restrict) { error_report("error recording dm state"); exit(1); } -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-03-08 17:39 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-08 17:39 [Qemu-devel] [PATCH v6 00/11] xen: xen-domid-restrict improvements Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 01/11] xen: link against xentoolcore Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 02/11] xen: restrict: use xentoolcore_restrict_all Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 20:03 ` [Qemu-devel] " Eduardo Habkost 2018-03-08 20:03 ` Eduardo Habkost 2018-03-09 11:33 ` [Qemu-devel] " Ian Jackson 2018-03-09 11:33 ` Ian Jackson 2018-03-09 12:07 ` [Qemu-devel] " Ian Jackson 2018-03-09 12:08 ` Ian Jackson 2018-03-09 12:08 ` Ian Jackson 2018-03-09 12:09 ` [Qemu-devel] " Ian Jackson 2018-03-09 12:09 ` Ian Jackson 2018-03-09 12:58 ` [Qemu-devel] " Eduardo Habkost 2018-03-09 12:58 ` Eduardo Habkost 2018-03-11 21:12 ` Stefano Stabellini 2018-03-11 21:12 ` [Qemu-devel] " Stefano Stabellini 2018-03-09 12:07 ` Ian Jackson 2018-03-09 12:55 ` Eduardo Habkost 2018-03-09 12:55 ` [Qemu-devel] " Eduardo Habkost 2018-03-08 17:39 ` [PATCH 04/11] xen: destroy_hvm_domain: Move reason into a variable Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] " Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 05/11] xen: move xc_interface compatibility fallback further up the file Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 06/11] xen: destroy_hvm_domain: Try xendevicemodel_shutdown Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 07/11] os-posix: Provide new -runas <uid>:<gid> facility Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:39 ` [PATCH 08/11] configure: do_compiler: Dump some extra info under bash Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] " Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 09/11] xen: Use newly added dmops for mapping VGA memory Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:39 ` Ian Jackson [this message] 2018-03-08 17:39 ` [PATCH 10/11] xen: Expect xenstore write to fail when restricted Ian Jackson 2018-03-08 17:39 ` [Qemu-devel] [PATCH 11/11] scripts/get_maintainer.pl: Print proper error message for missing $file Ian Jackson 2018-03-08 17:39 ` Ian Jackson 2018-03-08 17:45 ` [Qemu-devel] [PATCH v6 00/11] xen: xen-domid-restrict improvements Ian Jackson 2018-03-08 17:45 ` Ian Jackson 2018-03-08 17:54 ` [Qemu-devel] " no-reply 2018-03-08 17:54 ` no-reply 2018-03-08 17:58 ` Ian Jackson 2018-03-08 17:58 ` Ian Jackson 2018-03-08 18:10 ` no-reply 2018-03-08 18:10 ` no-reply 2018-03-08 20:00 ` no-reply 2018-03-08 20:00 ` no-reply 2018-03-08 21:45 ` no-reply 2018-03-08 21:45 ` no-reply
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=1520530757-4477-11-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 \ /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.