|
 |
9d0bc88 |
From 8c8bca077a913e7ae49798400f4ac3f121600881 Mon Sep 17 00:00:00 2001
|
|
|
9d0bc88 |
From: Daniel P. Berrange <berrange@redhat.com>
|
|
|
9d0bc88 |
Date: Mon, 12 Oct 2009 20:03:50 +0100
|
|
|
9d0bc88 |
Subject: [PATCH] Fix QEMU restore from file in raw format
|
|
|
9d0bc88 |
|
|
|
9d0bc88 |
The logic for running the decompression programs was broken in
|
|
|
9d0bc88 |
commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
|
|
|
9d0bc88 |
non-raw formats the decompression program was never run, and
|
|
|
9d0bc88 |
for raw formats, it tried to exec an argv[] with initial NULL
|
|
|
9d0bc88 |
in the program name.
|
|
|
9d0bc88 |
|
|
|
9d0bc88 |
* src/qemu/qemu_driver.c: Fix logic in runing decompression program
|
|
|
9d0bc88 |
|
|
|
9d0bc88 |
(cherry picked from commit 74b379cbd5ba9f472a3a2d5710e497966b1a3a37)
|
|
|
9d0bc88 |
|
|
|
9d0bc88 |
Fedora-patch: libvirt-fix-qemu-restore-from-raw.patch
|
|
|
9d0bc88 |
---
|
|
|
9d0bc88 |
src/qemu_driver.c | 3 +--
|
|
|
9d0bc88 |
1 files changed, 1 insertions(+), 2 deletions(-)
|
|
|
9d0bc88 |
|
|
|
9d0bc88 |
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
|
|
|
9d0bc88 |
index 550a59c..0ce403c 100644
|
|
|
9d0bc88 |
--- a/src/qemu_driver.c
|
|
|
9d0bc88 |
+++ b/src/qemu_driver.c
|
|
|
9d0bc88 |
@@ -4541,9 +4541,8 @@ static int qemudDomainRestore(virConnectPtr conn,
|
|
|
9d0bc88 |
goto cleanup;
|
|
|
9d0bc88 |
}
|
|
|
9d0bc88 |
|
|
|
9d0bc88 |
- if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
|
|
|
9d0bc88 |
+ if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
|
|
|
9d0bc88 |
intermediate_argv[0] = prog;
|
|
|
9d0bc88 |
- else {
|
|
|
9d0bc88 |
intermediatefd = fd;
|
|
|
9d0bc88 |
fd = -1;
|
|
|
9d0bc88 |
if (virExec(conn, intermediate_argv, NULL, NULL,
|
|
|
9d0bc88 |
--
|
|
|
9d0bc88 |
1.6.2.5
|
|
|
9d0bc88 |
|