External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Always QEMU_CAPS_VNC_MULTI_SERVERS

Browse Source 
All supported qemu versions now use the new commandline parser
functions, thus we can remove the old-style commandline generator.

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 09:25:32 +02:00
parent 8c5d7c44c1
commit c94c76c4e6
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_command.c
View File

@ -7909,10 +7909,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
switch (glisten->type) { switch (glisten->type) {
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_MULTI_SERVERS)) virBufferAddLit(&opt, "vnc=unix:");
virBufferAddLit(&opt, "vnc=unix:");
else
virBufferAddLit(&opt, "unix:");
virQEMUBuildBufferEscapeComma(&opt, glisten->socket); virQEMUBuildBufferEscapeComma(&opt, glisten->socket);
break; break;

2
tests/qemuxml2argvdata/name-escape.args
View File

@ -36,7 +36,7 @@ QEMU_AUDIO_DRV=spice \
-device isa-serial,chardev=charserial1,id=serial1 \ -device isa-serial,chardev=charserial1,id=serial1 \
-chardev pipe,id=charchannel0,path=/tmp/guestfwd,,foo \ -chardev pipe,id=charchannel0,path=/tmp/guestfwd,,foo \
-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \ -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
-vnc unix:/tmp/lib/domain--1-foo=1,,bar=2/vnc.sock \ -vnc vnc=unix:/tmp/lib/domain--1-foo=1,,bar=2/vnc.sock \
-spice unix,addr=/tmp/lib/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on \ -spice unix,addr=/tmp/lib/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-drive file.driver=iscsi,file.portal=example.foo.org:3260,file.target=iqn.1992-01.com.example:my,,storage,file.lun=1,file.transport=tcp,if=none,format=raw,id=drive-hostdev0 \ -drive file.driver=iscsi,file.portal=example.foo.org:3260,file.target=iqn.1992-01.com.example:my,,storage,file.lun=1,file.transport=tcp,if=none,format=raw,id=drive-hostdev0 \

2
tests/qemuxml2argvtest.c
View File

@ -1471,7 +1471,7 @@ mymain(void)
DO_TEST_CAPS_VER("graphics-vnc-auto-socket", "2.11.0"); DO_TEST_CAPS_VER("graphics-vnc-auto-socket", "2.11.0");
DO_TEST("graphics-vnc-none", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-vnc-none", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("graphics-vnc-socket-new-cmdline", QEMU_CAPS_VNC, DO_TEST("graphics-vnc-socket-new-cmdline", QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_VNC_MULTI_SERVERS); QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncSASL = 1; driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir); VIR_FREE(driver.config->vncSASLdir);