[libvirt] [PATCH] qemu: Don't emit tls-port spice option if port is -1
Jiri Denemark
jdenemar at redhat.com
Tue Feb 28 13:16:56 UTC 2012
Bug introduced by commit eda0fc7a.
---
src/qemu/qemu_command.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 01adf0d..5e0ca95 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:
--
1.7.8.5
More information about the libvir-list
mailing list