|
 |
7cf89a |
From c6b02db1183324ffd5e5f458d7922fb2e082f4ae Mon Sep 17 00:00:00 2001
|
|
|
7cf89a |
Message-Id: <c6b02db1183324ffd5e5f458d7922fb2e082f4ae@dist-git>
|
|
|
7cf89a |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
7cf89a |
Date: Fri, 21 Aug 2015 10:50:57 -0700
|
|
|
7cf89a |
Subject: [PATCH] Really fix XML formatting flags in SaveImageUpdateDef
|
|
|
7cf89a |
|
|
|
7cf89a |
Commit cf2d4c6 used a logical or instead of bitwise or,
|
|
|
7cf89a |
effectively passing 1, that is VIR_DOMAIN_XML_INACTIVE.
|
|
|
7cf89a |
|
|
|
7cf89a |
This was caught by a warning when building with clang.
|
|
|
7cf89a |
|
|
|
7cf89a |
https://bugzilla.redhat.com/show_bug.cgi?id=1183869 [7.2.0]
|
|
|
7cf89a |
https://bugzilla.redhat.com/show_bug.cgi?id=1254164 [7.2.0]
|
|
|
7cf89a |
https://bugzilla.redhat.com/show_bug.cgi?id=1255859 [7.1.z]
|
|
|
7cf89a |
|
|
|
7cf89a |
(cherry picked from commit c75f42f3318463b0555edac333c8f20d54b4d5dc)
|
|
|
7cf89a |
|
|
|
7cf89a |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7cf89a |
---
|
|
|
7cf89a |
src/qemu/qemu_driver.c | 2 +-
|
|
|
7cf89a |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7cf89a |
|
|
|
7cf89a |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
7cf89a |
index 299cf7b..b6ce10c 100644
|
|
|
7cf89a |
--- a/src/qemu/qemu_driver.c
|
|
|
7cf89a |
+++ b/src/qemu/qemu_driver.c
|
|
|
7cf89a |
@@ -5856,7 +5856,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver,
|
|
|
7cf89a |
|
|
|
7cf89a |
if (!(newdef_migr = qemuDomainDefCopy(driver,
|
|
|
7cf89a |
newdef,
|
|
|
7cf89a |
- QEMU_DOMAIN_FORMAT_LIVE_FLAGS ||
|
|
|
7cf89a |
+ QEMU_DOMAIN_FORMAT_LIVE_FLAGS |
|
|
|
7cf89a |
VIR_DOMAIN_XML_MIGRATABLE)))
|
|
|
7cf89a |
goto cleanup;
|
|
|
7cf89a |
|
|
|
7cf89a |
--
|
|
|
7cf89a |
2.5.0
|
|
|
7cf89a |
|