From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 28 Feb 2012 12:44:08 +0000 (+0100)
Subject: qemu: Don't emit tls-port spice option if port is -1
X-Git-Tag: v0.9.11-rc1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=238a5a4c3d35b616762d839fa9683ec5d9f4694a;p=thirdparty%2Flibvirt.git

qemu: Don't emit tls-port spice option if port is -1

Bug introduced by commit eda0fc7a.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 01adf0d9f8..5e0ca95286 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5345,13 +5345,16 @@ qemuBuildCommandLine(virConnectPtr conn,
 
         virBufferAsprintf(&opt, "port=%u", def->graphics[0]->data.spice.port);
 
-        if (def->graphics[0]->data.spice.tlsPort != -1)
+        if (def->graphics[0]->data.spice.tlsPort != -1) {
             if (!driver->spiceTLS) {
                 qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                _("spice TLS port set in XML configuration, but TLS is disabled in qemu.conf"));
+                                _("spice TLS port set in XML configuration,"
+                                  " but TLS is disabled in qemu.conf"));
                 goto error;
             }
-            virBufferAsprintf(&opt, ",tls-port=%u", def->graphics[0]->data.spice.tlsPort);
+            virBufferAsprintf(&opt, ",tls-port=%u",
+                              def->graphics[0]->data.spice.tlsPort);
+        }
 
         switch (virDomainGraphicsListenGetType(def->graphics[0], 0)) {
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: