[Xen-changelog] [xen-unstable] libxl: do not blunder on if bootloader fails

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
# Date 1343045376 -3600
# Node ID 405c7ea7c5deac768a0ab325d5b4c444382ddc0e
# Parent  3c426da4788e41cf798f709d9a3fef45e8503169
libxl: do not blunder on if bootloader fails

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>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 3c426da4788e -r 405c7ea7c5de tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c        Sun Jul 22 16:37:25 2012 +0100
+++ b/tools/libxl/libxl_create.c        Mon Jul 23 13:09:36 2012 +0100
@@ -672,7 +672,10 @@ static void domcreate_bootloader_done(li
     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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog