From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 27 Feb 2015 10:55:40 +0000 (+0100)
Subject: Really fix XML formatting flags in SaveImageUpdateDef
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c75f42f3318463b0555edac333c8f20d54b4d5dc;p=libvirt.git

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
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e9aa0b5fee..e2824643f0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5734,7 +5734,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;