Re: [Xen-devel] [PATCH v6 00/13] execute hotplug scripts from libxl

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

Ian Campbell writes ("Re: [Xen-devel] [PATCH v6 00/13] execute hotplug scripts 
from libxl"):
> On Thu, 2012-06-14 at 13:21 +0100, Roger Pau Monne wrote:
> ...
> 
> It seems that the error handling when the bootloader fails is broken by
> this change. Actually I think it was broken before (seemed to blindly
> plunge on, Ian J CCd) but now it just hangs.

The blindly plunging on seems to be my fault.  The patch below should
fix it I think.

Ian.

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index a633227..6599335 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -671,7 +671,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