If domain uses only TLS port we don't want to add 'port=0' explicitly to command line. --- src/qemu/qemu_command.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1e96982..440fd62 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6023,6 +6023,8 @@ qemuBuildCommandLine(virConnectPtr conn, char *netAddr = NULL; int ret; int defaultMode = def->graphics[0]->data.spice.defaultMode; + int port = def->graphics[0]->data.spice.port; + int tlsPort = def->graphics[0]->data.spice.tlsPort; if (!qemuCapsGet(caps, QEMU_CAPS_SPICE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -6030,17 +6032,19 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } - virBufferAsprintf(&opt, "port=%u", def->graphics[0]->data.spice.port); + if (port > 0 || tlsPort <= 0) + virBufferAsprintf(&opt, "port=%u", port); - if (def->graphics[0]->data.spice.tlsPort > 0) { + if (tlsPort > 0) { if (!driver->spiceTLS) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("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); + if (port > 0) + virBufferAddChar(&opt, ','); + virBufferAsprintf(&opt, "tls-port=%u", tlsPort); } switch (virDomainGraphicsListenGetType(def->graphics[0], 0)) { -- 1.7.8.6