From c6b02db1183324ffd5e5f458d7922fb2e082f4ae Mon Sep 17 00:00:00 2001
Message-Id: <c6b02db1183324ffd5e5f458d7922fb2e082f4ae@dist-git>
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Fri, 21 Aug 2015 10:50:57 -0700
Subject: [PATCH] Really fix XML formatting flags in SaveImageUpdateDef

Commit cf2d4c6 used a logical or instead of bitwise or,
effectively passing 1, that is VIR_DOMAIN_XML_INACTIVE.

This was caught by a warning when building with clang.

https://bugzilla.redhat.com/show_bug.cgi?id=1183869 [7.2.0]
https://bugzilla.redhat.com/show_bug.cgi?id=1254164 [7.2.0]
https://bugzilla.redhat.com/show_bug.cgi?id=1255859 [7.1.z]

(cherry picked from commit c75f42f3318463b0555edac333c8f20d54b4d5dc)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 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 299cf7b..b6ce10c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5856,7 +5856,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver,
 
     if (!(newdef_migr = qemuDomainDefCopy(driver,
                                           newdef,
-                                          QEMU_DOMAIN_FORMAT_LIVE_FLAGS ||
+                                          QEMU_DOMAIN_FORMAT_LIVE_FLAGS |
                                           VIR_DOMAIN_XML_MIGRATABLE)))
         goto cleanup;
 
-- 
2.5.0