[libvirt] [PATCH 1/3] qemu: Drop QEMU_CAPS_VNC_WEBSOCKET

The capability was introduced in QEMU 1.3.1 and we require QEMU 1.5.0 these days. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 4 ---- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 9 +-------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 3 ++- 34 files changed, 4 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 08cf822b88..e0c847f00a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4146,10 +4146,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasicArch(qemuCaps); - /* WebSockets were introduced between 1.3.0 and 1.3.1 */ - if (qemuCaps->version >= 1003001) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET); - /* -chardev spiceport is supported from 1.4.0, but usable through * qapi only since 1.5.0, however, it still cannot be queried * for as a capability */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0f69c69136..fad223eab7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -253,7 +253,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 145 */ X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */ QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */ - QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */ + X_QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */ QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */ QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ff9589f593..95d79235a4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7843,15 +7843,8 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, virBufferAsprintf(&opt, ":%d", graphics->data.vnc.port - 5900); - if (graphics->data.vnc.websocket) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("VNC WebSockets are not supported " - "with this QEMU binary")); - goto error; - } + if (graphics->data.vnc.websocket) virBufferAsprintf(&opt, ",websocket=%d", graphics->data.vnc.websocket); - } break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index b791b13830..34239f1ecc 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -64,7 +64,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 3a0df4d417..17b430878e 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -65,7 +65,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='mlock'/> <flag name='device-del-event'/> <flag name='dmi-to-pci-bridge'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index dede48d65f..8d0bad6225 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -65,7 +65,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 05badb6675..e2d3e3f55b 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index d1224410f6..73a9c46dde 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -53,7 +53,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 8eac816b3a..2c9045ce2f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -53,7 +53,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index a8cd1fe158..c19c47429d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index abe2f8e930..ac865604e5 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index b1a7b167b2..55180439af 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 90bb897485..248bd9c5db 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index d83d8d42f5..fbee1f5049 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -53,7 +53,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 790bebfb4d..73829a191b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -53,7 +53,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index abc40ec795..6ce9c3fff7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 76e3bd79e7..43f267c312 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index d8d2b7939f..597c477f72 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 698ea77af6..ad616e16ae 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 4ca53ff85d..2155a2bf14 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -55,7 +55,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index f2c1e2c5b8..f7e614c413 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -53,7 +53,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 6ff4e10169..d264731275 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index bb8849f55c..850ac3ca8a 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 40b07a58f0..35d8a3c40b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 5c655caff3..385bf0b529 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index f316ab7fbd..5f2d68ca05 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index af7a11504b..13ab6ecbbe 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -53,7 +53,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index 1e44c1952c..bc4b7a4802 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 96f21561bd..c585bce982 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 7c674ffb9c..b6d83c4b18 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -53,7 +53,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index fecef3a0cf..17e30af5f2 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -27,7 +27,6 @@ <flag name='tpm-passthrough'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 4cae4fd058..b29a6f43cb 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -27,7 +27,6 @@ <flag name='tpm-passthrough'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 1a2d1b6a53..92f78ee82e 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -67,7 +67,6 @@ <flag name='vfio-pci'/> <flag name='scsi-generic'/> <flag name='mem-merge'/> - <flag name='vnc-websocket'/> <flag name='drive-discard'/> <flag name='mlock'/> <flag name='device-del-event'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 04b6c00eba..0b54ba6646 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1235,7 +1235,8 @@ mymain(void) DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); - DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_VNC_WEBSOCKET, + DO_TEST("graphics-vnc-websocket", + QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); -- 2.17.1