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