From: Jincheng Miao <jmiao@redhat.com>
Date: Fri, 27 Jun 2014 14:37:02 +0000 (+0800)
Subject: qemu: fix domxml-to-native failing when spice_tls is not enabled
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e871ab8862e48485c46177dcfd95da8f945908ae;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: fix domxml-to-native failing when spice_tls is not enabled

The default graphics channel mode is 'any', so as to defaultMode attribute.
If defaultMode and channel mode are all the default value 'any',
qemuConnectDomainXMLToNative will set TLSPort.
But in qemuBuildGraphicsSPICECommandLine, if spice_tls is not enabled, libvirtd
will report an error to tell the user that spice TLS is disabled in qemu.conf.

So qemuConnectDomainXMLToNative should check spice_tls is enabled,
then decide to allocate an tlsPort number to this graphics.

If user specified defaultMode is 'secure', qemuConnectDomainXMLToNative
could allocate tlsPort, and then let qemuBuildGraphicsSPICECommandLine reports
the spice_tls disabled error.

The related bug is:
https://bugzilla.redhat.com/show_bug.cgi?id=1113868

Signed-off-by: Jincheng Miao <jmiao@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0a9d0408b..ecccf6ca0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6015,7 +6015,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
                             break;
 
                         case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY:
-                            needTLSPort = true;
+                            if (cfg->spiceTLS)
+                                needTLSPort = true;
                             needPort = true;
                             break;
                         }