Re: [Xen-devel] [PATCH 2/2] libxl: do not blunder on if bootloader fails

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Fri, 2012-07-20 at 19:18 +0100, Ian Jackson wrote:
> If the bootloader failed, we would call the creation failure callback
> but _also_ blunder on trying to recreate the domain, due to a missing
> "return".
> 
> Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Reported-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>

I have been running with this one applied locally since you first posted
it so I think it is good to go in.

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

> ---
>  tools/libxl/libxl_create.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> index 294a73f..0bfa8ba 100644
> --- a/tools/libxl/libxl_create.c
> +++ b/tools/libxl/libxl_create.c
> @@ -672,7 +672,10 @@ static void domcreate_bootloader_done(libxl__egc *egc,
>      libxl__srm_restore_autogen_callbacks *const callbacks =
>          &dcs->shs.callbacks.restore.a;
>  
> -    if (rc) domcreate_rebuild_done(egc, dcs, rc);
> +    if (rc) {
> +        domcreate_rebuild_done(egc, dcs, rc);
> +        return;
> +    }
>  
>      /* consume bootloader outputs. state->pv_{kernel,ramdisk} have
>       * been initialised by the bootloader already.



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel