diff options
| author | Sander Eikelenboom <linux@eikelenboom> | 2012-10-25 16:04:54 +0100 |
|---|---|---|
| committer | Sander Eikelenboom <linux@eikelenboom> | 2012-10-25 16:04:54 +0100 |
| commit | 95c286c6309f312eac98de95c0c5eaf61514b685 (patch) | |
| tree | 9a17493aa6883b099429ad48411f631f19cd78a4 /tools | |
| parent | 78c579426fb565e5eb446ab653176fe7f2f7c4c4 (diff) | |
| download | xen-95c286c6309f312eac98de95c0c5eaf61514b685.tar.gz xen-95c286c6309f312eac98de95c0c5eaf61514b685.tar.bz2 xen-95c286c6309f312eac98de95c0c5eaf61514b685.zip | |
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 <linux@eikelenboom>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libxl/xl_cmdimpl.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |