From ce6819c96bd063ba8c4f8e78e305538ebc779aea Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 11 Apr 2012 17:43:47 +0100
Subject: launch: Set error when qemu fails early during launch (RHBZ#811650).

This caused the Python bindings (and probably others) to
segfault because guestfs_last_error(g) would return NULL.
(cherry picked from commit 0f7de2279a4af0bb259c9e36fca5e5c3aa835301)
---
 src/launch.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/launch.c b/src/launch.c
index 1a7c8236..1f2c2a8d 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -963,7 +963,10 @@ launch_appliance (guestfs_h *g)
   r = guestfs___recv_from_daemon (g, &size, &buf);
   free (buf);
 
-  if (r == -1) return -1;
+  if (r == -1) {
+    error (g, _("guestfs_launch failed, see earlier error messages"));
+    goto cleanup1;
+  }
 
   if (size != GUESTFS_LAUNCH_FLAG) {
     error (g, _("guestfs_launch failed, see earlier error messages"));
-- 
cgit