From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 14 May 2014 07:43:52 +0000 (+0200)
Subject: qemu: snapshot: Terminate job when memory compression program isn't found
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=71802685ba49a80326d69fd446d2f25844526ba8;p=libvirt.git

qemu: snapshot: Terminate job when memory compression program isn't found

If the compression program for external snapshot memory image isn't
found we exitted the function without terminating the domain job. This
caused the domain to be unusable.

The problem was introduced in commit 7df5093f.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1097503
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a5c7f4fb75..52ca47c33e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13207,13 +13207,14 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
                 virReportError(VIR_ERR_OPERATION_FAILED, "%s",
                                _("Invalid snapshot image format specified "
                                  "in configuration file"));
-                goto cleanup;
+                goto endjob;
             }
+
             if (!qemuCompressProgramAvailable(compressed)) {
                 virReportError(VIR_ERR_OPERATION_FAILED, "%s",
                                _("Compression program for image format "
                                  "in configuration file isn't available"));
-                goto cleanup;
+                goto endjob;
             }
         }