[libvirt] [PATCH] qemuBuildCommandLine: Don't add tlsPort if none set

[Michal Privoznik]

On 08.03.2012 23:26, Eric Blake wrote:
> On 03/08/2012 06:30 AM, Michal Privoznik wrote:
>> If user hasn't supplied any tlsPort we default to setting it
>> to zero in our internal structure. However, when building command
>> line we test it against -1 which is obviously wrong.
>> ---
>>  src/qemu/qemu_command.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
>> index de2d4a1..ed82cc2 100644
>> --- a/src/qemu/qemu_command.c
>> +++ b/src/qemu/qemu_command.c
>> @@ -5374,7 +5374,7 @@ 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) {
> 
> ACK.
> 

Thanks, pushed. However, turned out I've needed to update one test as well:

diff --git
a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
index 62ce46f..ebda714 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
@@ -10,6 +10,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test
LOGNAME=test QEMU_AUDIO_DRV=spice \
 -device rtl8139,vlan=0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \
 -net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 -serial pty \
 -usb -device usb-tablet,id=input0 \
--spice port=5900,tls-port=0,x509-dir=/etc/pki/libvirt-spice -vga std \
+-spice port=5900,x509-dir=/etc/pki/libvirt-spice -vga std \
 -device AC97,id=sound0,bus=pci.0,addr=0x3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5


That is, don't add wildcard tls-port zero to generated commandline.
Sorry for this incompleteness.