From: Jason Andryuk <jandryuk@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>, Wei Liu <wl@xen.org>,
Jason Andryuk <jandryuk@gmail.com>
Subject: [PATCH] xl: Allow shutdown wait for domain death
Date: Tue, 16 Jun 2020 22:36:42 -0400 [thread overview]
Message-ID: <20200617023642.80594-1-jandryuk@gmail.com> (raw)
`xl shutdown -w` waits for the first of either domain shutdown or death.
Shutdown is the halting of the guest operating system, and death is the
freeing of domain resources.
Allow specifying -w multiple times to wait for only domain death. This
is useful in scripts so that all resources are free before the script
continues.
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
docs/man/xl.1.pod.in | 4 +++-
tools/xl/xl_vmcontrol.c | 17 +++++++++++------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in
index 09339282e6..52a47a6fbd 100644
--- a/docs/man/xl.1.pod.in
+++ b/docs/man/xl.1.pod.in
@@ -743,7 +743,9 @@ of a Xen system.
=item B<-w>, B<--wait>
-Wait for the domain to complete shutdown before returning.
+Wait for the domain to complete shutdown before returning. If given once,
+the wait is for domain shutdown or domain death. If given multiple times,
+the wait is for domain death only.
=item B<-F>
diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c
index 17b4514c94..435155a033 100644
--- a/tools/xl/xl_vmcontrol.c
+++ b/tools/xl/xl_vmcontrol.c
@@ -162,7 +162,8 @@ static void shutdown_domain(uint32_t domid,
}
}
-static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr)
+static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr,
+ int wait_for_shutdown_or_death)
{
int rc, count = 0;
LOG("Waiting for %d domains", nr);
@@ -183,8 +184,12 @@ static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr)
case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN:
LOG("Domain %d has been shut down, reason code %d",
event->domid, event->u.domain_shutdown.shutdown_reason);
- libxl_evdisable_domain_death(ctx, deathws[event->for_user]);
- count++;
+ if (wait_for_shutdown_or_death) {
+ libxl_evdisable_domain_death(ctx, deathws[event->for_user]);
+ count++;
+ } else {
+ LOG("Domain %d continue waiting for death", event->domid);
+ }
break;
default:
LOG("Unexpected event type %d", event->type);
@@ -214,7 +219,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv)
all = 1;
break;
case 'w':
- wait_for_it = 1;
+ wait_for_it++;
break;
case 'F':
fallback_trigger = 1;
@@ -246,7 +251,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv)
}
if (deathws) {
- wait_for_domain_deaths(deathws, nrdeathws);
+ wait_for_domain_deaths(deathws, nrdeathws, wait_for_it == 1);
free(deathws);
}
@@ -258,7 +263,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv)
fn(domid, wait_for_it ? &deathw : NULL, 0, fallback_trigger);
if (wait_for_it)
- wait_for_domain_deaths(&deathw, 1);
+ wait_for_domain_deaths(&deathw, 1, wait_for_it == 1);
}
--
2.25.1
next reply other threads:[~2020-06-17 2:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 2:36 Jason Andryuk [this message]
2020-06-18 15:43 ` [PATCH for-4.14] xl: Allow shutdown wait for domain death Ian Jackson
2020-06-18 15:52 ` Paul Durrant
2020-06-18 16:00 ` 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=20200617023642.80594-1-jandryuk@gmail.com \
--to=jandryuk@gmail.com \
--cc=anthony.perard@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wl@xen.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).