External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemu: command: Always assume QEMU_CAPS_VNC_OPTS

Browse Source 
The switch to QemuOpts parser which brought the long-form options
happened in qemu commit 4db14629c3 ("vnc: switch to QemuOpts, allow
multiple servers") released in v2.3.0.

We can always assume this capability and remove the old-style
generators.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-23 10:10:05 +02:00
parent 01c65d761c
commit 087dbb16c6
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_command.c
View File

@ -7955,10 +7955,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
}
if (graphics->data.vnc.auth.passwd || cfg->vncPassword) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS))
virBufferAddLit(&opt, ",password=on");
else
virBufferAddLit(&opt, ",password");
virBufferAddLit(&opt, ",password=on");
}
if (cfg->vncTLS) {
@ -7986,10 +7983,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
}
if (cfg->vncSASL) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS))
virBufferAddLit(&opt, ",sasl=on");
else
virBufferAddLit(&opt, ",sasl");
virBufferAddLit(&opt, ",sasl=on");
if (cfg->vncSASLdir)
virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);

2
tests/qemuxml2argvdata/graphics-vnc-sasl.args
View File

@ -28,6 +28,6 @@ SASL_CONF_PATH=/root/.sasl2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-vnc 127.0.0.1:3,sasl \
-vnc 127.0.0.1:3,sasl=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-msg timestamp=on