|
 |
43fe83 |
From 9787da1f764c3a2fcccaf5f4dd5227dab5abb82d Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <9787da1f764c3a2fcccaf5f4dd5227dab5abb82d.1379597660.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
43fe83 |
Date: Tue, 17 Sep 2013 10:19:33 +0200
|
|
|
43fe83 |
Subject: [PATCH] qemu: Use "migratable" XML definition when doing external
|
|
|
43fe83 |
checkpoints
|
|
|
43fe83 |
|
|
|
43fe83 |
In the original implementation of external checkpoints I've mistakenly
|
|
|
43fe83 |
used the live definition to be stored in the save image. The normal
|
|
|
43fe83 |
approach is to use the "migratable" definition. This was discovered when
|
|
|
43fe83 |
commit 07966f6a8b5ccb5bb4c716b25deb8ba2e572cc67 changed the behavior to
|
|
|
43fe83 |
use a converted XML from the user to do the compatibility check to fix
|
|
|
43fe83 |
problem when using the regular machine saving.
|
|
|
43fe83 |
|
|
|
43fe83 |
As the previous patch added a compatibility layer, we can now change the
|
|
|
43fe83 |
type of the XML in the image.
|
|
|
43fe83 |
|
|
|
43fe83 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1008340
|
|
|
43fe83 |
(cherry picked from commit 1b7bfa65e36996fc3a204452d2a844ab9f4b52b3)
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/qemu/qemu_driver.c | 2 +-
|
|
|
43fe83 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
43fe83 |
index 9b9732d..71d773c 100644
|
|
|
43fe83 |
--- a/src/qemu/qemu_driver.c
|
|
|
43fe83 |
+++ b/src/qemu/qemu_driver.c
|
|
|
43fe83 |
@@ -12427,7 +12427,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
|
|
|
43fe83 |
JOB_MASK(QEMU_JOB_SUSPEND) |
|
|
|
43fe83 |
JOB_MASK(QEMU_JOB_MIGRATION_OP));
|
|
|
43fe83 |
|
|
|
43fe83 |
- if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, false)))
|
|
|
43fe83 |
+ if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true)))
|
|
|
43fe83 |
goto endjob;
|
|
|
43fe83 |
|
|
|
43fe83 |
if ((ret = qemuDomainSaveMemory(driver, vm, snap->def->file,
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.3.2
|
|
|
43fe83 |
|