From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 19 Apr 2013 05:00:44 +0000 (+0200)
Subject: qemu: fix default spice password setting
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f048d08408a5396535e6c759c047e74ece65eb8f;p=thirdparty%2Flibvirt.git

qemu: fix default spice password setting

Set spice password even if default VNC password hasn't been set.

https://bugzilla.redhat.com/show_bug.cgi?id=953720
(cherry picked from commit 4327df7eee75c5bec485703eb5b5f439f2fd371f)
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 78961a7ddb..e5e7fbdc42 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2688,7 +2688,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr driver,
     int ret = -1;
     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
 
-    if (!auth->passwd && !cfg->vncPassword) {
+    if (!auth->passwd && !defaultPasswd) {
         ret = 0;
         goto cleanup;
     }