From: Luyao Huang <lhuang@redhat.com>
Date: Tue, 20 Jan 2015 09:04:41 +0000 (+0800)
Subject: qemu: fix cannot set graphic passwd via qemuDomainSaveImageDefineXML
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f76df311e8896957b92d0e0c5251ee3e6754d9ac;p=libvirt.git

qemu: fix cannot set graphic passwd via qemuDomainSaveImageDefineXML

https://bugzilla.redhat.com/show_bug.cgi?id=1183890

When we try to update a xml to a image file, we will clear the
graphics passwd settings, because we do not pass VIR_DOMAIN_XML_SECURE
to qemuDomainDefCopy, qemuDomainDefFormatBuf won't format the passwd.

Add VIR_DOMAIN_XML_SECURE flag when we call qemuDomainDefCopy
in qemuDomainSaveImageUpdateDef.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index bc0a48c172..1d3bee67f4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5623,7 +5623,8 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver,
 
     if (!(newdef_migr = qemuDomainDefCopy(driver,
                                           newdef,
-                                          VIR_DOMAIN_XML_MIGRATABLE)))
+                                          VIR_DOMAIN_XML_MIGRATABLE |
+                                          VIR_DOMAIN_XML_SECURE)))
         goto cleanup;
 
     if (!virDomainDefCheckABIStability(def, newdef_migr)) {