From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 12 Oct 2009 19:03:50 +0000 (+0100)
Subject: Fix QEMU restore from file in raw format
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=74b379cbd5ba9f472a3a2d5710e497966b1a3a37;p=libvirt.git

Fix QEMU restore from file in raw format

The logic for running the decompression programs was broken in
commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
non-raw formats the decompression program was never run, and
for raw formats, it tried to exec an argv[] with initial NULL
in the program name.

* src/qemu/qemu_driver.c: Fix logic in runing decompression program
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3812f91077..c544c4b4c7 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3794,9 +3794,8 @@ static int qemudDomainRestore(virConnectPtr conn,
             goto cleanup;
         }
 
-        if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
+        if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
             intermediate_argv[0] = prog;
-        else {
             intermediatefd = fd;
             fd = -1;
             if (virExec(conn, intermediate_argv, NULL, NULL,