Xen devel - Oct 2012 - xl: Fix accidently waiting for domains to shutdown without --wait option

xl: Fix accidently waiting for domains to shutdown without --wait option

From: Sander Eikelenboom <linux@eikelenboom>

Introduced by changeset 26091: "xl: Add --wait and --all to xl
reboot."

Signed-off-by: Sander Eikelenboom <linux@eikelenboom>
---
 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 dc80595..0e65f2b 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3774,7 +3774,9 @@ static int main_shutdown_or_reboot(int 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;
-- 
1.7.2.5

Ping ?

Saturday, October 20, 2012, 1:13:04 AM, you wrote:
> From: Sander Eikelenboom <linux@eikelenboom>
> Introduced by changeset 26091: "xl: Add --wait and --all to xl
reboot."
> Signed-off-by: Sander Eikelenboom <linux@eikelenboom>
> ---
>  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 dc80595..0e65f2b 100644
> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -3774,7 +3774,9 @@ static int main_shutdown_or_reboot(int 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;

linux@eikelenboom.it writes ("[Xen-devel] [PATCH 1/1] xl: Fix accidently
waiting for domains to shutdown without --wait
option"):
> From: Sander Eikelenboom <linux@eikelenboom>
> 
> 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>