From 95c286c6309f312eac98de95c0c5eaf61514b685 Mon Sep 17 00:00:00 2001 From: Sander Eikelenboom Date: Thu, 25 Oct 2012 16:04:54 +0100 Subject: xl: Fix accidently waiting for domains to shutdown without --wait option Introduced by changeset 26091: "xl: Add --wait and --all to xl reboot." Signed-off-by: Sander Eikelenboom Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/xl_cmdimpl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 92ac0c3751..5a947da409 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3774,7 +3774,9 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) fallback_trigger); } - wait_for_domain_deaths(deathws, nb_domain - 1 /* not dom 0 */); + if (wait_for_it) + wait_for_domain_deaths(deathws, nb_domain - 1 /* not dom 0 */); + libxl_dominfo_list_free(dominfo, nb_domain); } else { libxl_evgen_domain_death *deathw = NULL; -- cgit v1.2.3