From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 2/2] libxl: do not blunder on if bootloader fails Date: Fri, 20 Jul 2012 19:18:30 +0100 Message-ID: <1342808310-25480-3-git-send-email-ian.jackson@eu.citrix.com> References: <1342808310-25480-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1342808310-25480-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Ian Jackson List-Id: xen-devel@lists.xenproject.org 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 Reported-by: Roger Pau Monne --- 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. -- 1.7.2.5