[libvirt] [PATCH 0/3] qemu: Drop some cruft
No longer needed since we bumped our minimum QEMU version to 1.5.0. Andrea Bolognani (3): qemu: Drop QEMU_CAPS_VNC_WEBSOCKET qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT qemu: Drop redundant version checks src/qemu/qemu_capabilities.c | 27 +++++-------------- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_command.c | 14 +--------- .../caps_1.5.3.x86_64.xml | 2 -- .../caps_1.6.0.x86_64.xml | 2 -- .../caps_1.7.0.x86_64.xml | 2 -- .../caps_2.1.1.x86_64.xml | 2 -- .../caps_2.10.0.aarch64.xml | 2 -- .../caps_2.10.0.ppc64.xml | 2 -- .../caps_2.10.0.s390x.xml | 2 -- .../caps_2.10.0.x86_64.xml | 2 -- .../caps_2.11.0.s390x.xml | 2 -- .../caps_2.11.0.x86_64.xml | 2 -- .../caps_2.12.0.aarch64.xml | 2 -- .../caps_2.12.0.ppc64.xml | 2 -- .../caps_2.12.0.s390x.xml | 2 -- .../caps_2.12.0.x86_64.xml | 2 -- .../caps_2.4.0.x86_64.xml | 2 -- .../caps_2.5.0.x86_64.xml | 2 -- .../caps_2.6.0.aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- .../caps_2.6.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- .../caps_2.7.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- .../caps_2.8.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- .../caps_2.9.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- .../caps_3.0.0.riscv32.xml | 2 -- .../caps_3.0.0.riscv64.xml | 2 -- .../caps_3.0.0.x86_64.xml | 2 -- tests/qemuxml2argvtest.c | 6 ++--- 34 files changed, 12 insertions(+), 99 deletions(-) -- 2.17.1
The capability was introduced in QEMU 1.3.1 and we require QEMU 1.5.0 these days. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- 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
The capability was introduced in QEMU 1.5.0, which it's our minimum supported QEMU version these days. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 5 ----- 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, 2 insertions(+), 44 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e0c847f00a..499befb2cf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4146,12 +4146,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasicArch(qemuCaps); - /* -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 */ - if (qemuCaps->version >= 1005000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT); - if (qemuCaps->version >= 1006000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index fad223eab7..a0134493aa 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -276,7 +276,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_PANIC, /* -device pvpanic */ QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */ QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */ - QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */ + X_QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */ /* 165 */ QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 95d79235a4..0a353f87ba 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5224,11 +5224,6 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("spiceport not supported in this QEMU binary")); - goto cleanup; - } virBufferAsprintf(&buf, "spiceport,id=%s,name=%s", charAlias, dev->data.spiceport.channel); break; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 34239f1ecc..bff3d7aab5 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -74,7 +74,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> <flag name='pvpanic'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='usb-audio'/> <flag name='splash-timeout'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 17b430878e..65982d8d74 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -78,7 +78,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 8d0bad6225..003eafb5e0 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -79,7 +79,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='usb-audio'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index e2d3e3f55b..a914df47f2 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 73a9c46dde..af4cd3765b 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -62,7 +62,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 2c9045ce2f..f468c24ac2 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index c19c47429d..3cbe7e893d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index ac865604e5..65b3712bb9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 55180439af..8c051025f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 248bd9c5db..ef43099953 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index fbee1f5049..71c3d0f53f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -62,7 +62,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 73829a191b..d638663c75 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 6ce9c3fff7..f1a154c4c4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 43f267c312..2bded9fc38 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 597c477f72..2d66c04c16 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index ad616e16ae..f06df3838d 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 2155a2bf14..fae6487f72 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -64,7 +64,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index f7e614c413..0cd8b351db 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index d264731275..1007db9a7d 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index 850ac3ca8a..9124cb2079 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 35d8a3c40b..022612246b 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 385bf0b529..62ee3fcf16 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 5f2d68ca05..7bd5bba7ed 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 13ab6ecbbe..c2aa3e15ce 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index bc4b7a4802..6bd5683673 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index c585bce982..2deb2b09fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index b6d83c4b18..ce70bbad61 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -60,7 +60,6 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 17e30af5f2..f6e74ee7c6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -32,7 +32,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index b29a6f43cb..b6b1bc12db 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -32,7 +32,6 @@ <flag name='device-del-event'/> <flag name='virtio-mmio'/> <flag name='boot-strict'/> - <flag name='spiceport'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> <flag name='change-backing-file'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 92f78ee82e..1d910a9679 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> <flag name='active-commit'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0b54ba6646..62486ac77b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1395,8 +1395,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_CHARDEV_SPICEPORT); + QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-spiceport-nospice", NONE); DO_TEST("console-compat", -- 2.17.1
On Wed, Sep 12, 2018 at 02:48:53PM +0200, Andrea Bolognani wrote:
The capability was introduced in QEMU 1.5.0, which it's our
*is
minimum supported QEMU version these days.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 5 ----- 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, 2 insertions(+), 44 deletions(-)
Jano
We require QEMU 1.5.0 these days, so checking for versions older than that is pointless. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_capabilities.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 499befb2cf..96a65046ba 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1724,10 +1724,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, * * ref405ep: no pci * taihu: no pci - * bamboo: 1.1.0 + * bamboo: 1.1.0 (<= 1.5.0, so basically forever) * mac99: 2.0.0 * g3beige: 2.0.0 - * prep: 1.4.0 + * prep: 1.4.0 (<= 1.5.0, so basically forever) * pseries: 2.0.0 * mpc8544ds: forever * virtex-m507: no pci @@ -1749,16 +1749,11 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, STREQ(def->os.machine, "ppce500")) return true; - if (qemuCaps->version >= 1004000 && - STREQ(def->os.machine, "prep")) - return true; - - if (qemuCaps->version >= 1001000 && - STREQ(def->os.machine, "bamboo")) - return true; - - if (STREQ(def->os.machine, "mpc8544ds")) + if (STREQ(def->os.machine, "bamboo") || + STREQ(def->os.machine, "mpc8544ds") || + STREQ(def->os.machine, "prep")) { return true; + } return false; } -- 2.17.1
On Wed, Sep 12, 2018 at 02:48:51PM +0200, Andrea Bolognani wrote:
No longer needed since we bumped our minimum QEMU version to 1.5.0.
Andrea Bolognani (3): qemu: Drop QEMU_CAPS_VNC_WEBSOCKET qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT qemu: Drop redundant version checks
Series: Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On 09/12/2018 08:48 AM, Andrea Bolognani wrote:
No longer needed since we bumped our minimum QEMU version to 1.5.0.
Andrea Bolognani (3): qemu: Drop QEMU_CAPS_VNC_WEBSOCKET qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT qemu: Drop redundant version checks
src/qemu/qemu_capabilities.c | 27 +++++-------------- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_command.c | 14 +--------- .../caps_1.5.3.x86_64.xml | 2 -- .../caps_1.6.0.x86_64.xml | 2 -- .../caps_1.7.0.x86_64.xml | 2 -- .../caps_2.1.1.x86_64.xml | 2 -- .../caps_2.10.0.aarch64.xml | 2 -- .../caps_2.10.0.ppc64.xml | 2 -- .../caps_2.10.0.s390x.xml | 2 -- .../caps_2.10.0.x86_64.xml | 2 -- .../caps_2.11.0.s390x.xml | 2 -- .../caps_2.11.0.x86_64.xml | 2 -- .../caps_2.12.0.aarch64.xml | 2 -- .../caps_2.12.0.ppc64.xml | 2 -- .../caps_2.12.0.s390x.xml | 2 -- .../caps_2.12.0.x86_64.xml | 2 -- .../caps_2.4.0.x86_64.xml | 2 -- .../caps_2.5.0.x86_64.xml | 2 -- .../caps_2.6.0.aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- .../caps_2.6.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- .../caps_2.7.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- .../caps_2.8.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- .../caps_2.9.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- .../caps_3.0.0.riscv32.xml | 2 -- .../caps_3.0.0.riscv64.xml | 2 -- .../caps_3.0.0.x86_64.xml | 2 -- tests/qemuxml2argvtest.c | 6 ++--- 34 files changed, 12 insertions(+), 99 deletions(-)
Any chance this can wait? Would be nice to have other series posted upstream that have changes to .xml and .replies files to add new functionality be processed first. There's a series to use - memfd from Marc-Andre Laurent that gets impacted. Yeah - I know - first to merge wins... John
On Wed, Sep 12, 2018 at 09:09:26AM -0400, John Ferlan wrote:
On 09/12/2018 08:48 AM, Andrea Bolognani wrote:
No longer needed since we bumped our minimum QEMU version to 1.5.0.
Andrea Bolognani (3): qemu: Drop QEMU_CAPS_VNC_WEBSOCKET qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT qemu: Drop redundant version checks
src/qemu/qemu_capabilities.c | 27 +++++-------------- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_command.c | 14 +--------- .../caps_1.5.3.x86_64.xml | 2 -- .../caps_1.6.0.x86_64.xml | 2 -- .../caps_1.7.0.x86_64.xml | 2 -- .../caps_2.1.1.x86_64.xml | 2 -- .../caps_2.10.0.aarch64.xml | 2 -- .../caps_2.10.0.ppc64.xml | 2 -- .../caps_2.10.0.s390x.xml | 2 -- .../caps_2.10.0.x86_64.xml | 2 -- .../caps_2.11.0.s390x.xml | 2 -- .../caps_2.11.0.x86_64.xml | 2 -- .../caps_2.12.0.aarch64.xml | 2 -- .../caps_2.12.0.ppc64.xml | 2 -- .../caps_2.12.0.s390x.xml | 2 -- .../caps_2.12.0.x86_64.xml | 2 -- .../caps_2.4.0.x86_64.xml | 2 -- .../caps_2.5.0.x86_64.xml | 2 -- .../caps_2.6.0.aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- .../caps_2.6.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- .../caps_2.7.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- .../caps_2.8.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- .../caps_2.9.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- .../caps_3.0.0.riscv32.xml | 2 -- .../caps_3.0.0.riscv64.xml | 2 -- .../caps_3.0.0.x86_64.xml | 2 -- tests/qemuxml2argvtest.c | 6 ++--- 34 files changed, 12 insertions(+), 99 deletions(-)
Any chance this can wait? Would be nice to have other series posted upstream that have changes to .xml and .replies files to add new functionality be processed first.
This series does not touch the .replies files. The .xml conflicts only adding new capabilities are trivial to resolve: http://repo.or.cz/tomko-tools.git/blob/HEAD:/rcc Jano
There's a series to use - memfd from Marc-Andre Laurent that gets impacted.
Yeah - I know - first to merge wins...
John
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Wed, 2018-09-12 at 09:09 -0400, John Ferlan wrote:
Any chance this can wait? Would be nice to have other series posted upstream that have changes to .xml and .replies files to add new functionality be processed first.
There's a series to use - memfd from Marc-Andre Laurent that gets impacted.
I see you've already had to rebase locally to apply the patches at all, due to other changes being pushed in the meantime, so I don't see how pushing this series too would make it any worse. Also IIUC you've asked Marc-André to make some changes that depend on *another series* of yours, that still hasn't been pushed, which means a respin will be necessary either way, won't it? All in all I see no reason to dealy pushing this. -- Andrea Bolognani / Red Hat / Virtualization
On 09/12/2018 09:35 AM, Andrea Bolognani wrote:
On Wed, 2018-09-12 at 09:09 -0400, John Ferlan wrote:
Any chance this can wait? Would be nice to have other series posted upstream that have changes to .xml and .replies files to add new functionality be processed first.
There's a series to use - memfd from Marc-Andre Laurent that gets impacted.
I see you've already had to rebase locally to apply the patches at all, due to other changes being pushed in the meantime, so I don't see how pushing this series too would make it any worse.
Also IIUC you've asked Marc-André to make some changes that depend on *another series* of yours, that still hasn't been pushed, which means a respin will be necessary either way, won't it?
All in all I see no reason to dealy pushing this.
OK - go ahead. It was just a "would be nice" type inquiry. It's not the first time capability changes cause conflicts and it won't be the last unless we come up with a better process for them. John
On Wed, Sep 12, 2018 at 09:45:32AM -0400, John Ferlan wrote:
On 09/12/2018 09:35 AM, Andrea Bolognani wrote:
On Wed, 2018-09-12 at 09:09 -0400, John Ferlan wrote:
Any chance this can wait? Would be nice to have other series posted upstream that have changes to .xml and .replies files to add new functionality be processed first.
There's a series to use - memfd from Marc-Andre Laurent that gets impacted.
* Lureau
I see you've already had to rebase locally to apply the patches at all, due to other changes being pushed in the meantime, so I don't see how pushing this series too would make it any worse.
Also IIUC you've asked Marc-André to make some changes that depend on *another series* of yours, that still hasn't been pushed, which means a respin will be necessary either way, won't it?
All in all I see no reason to dealy pushing this.
OK - go ahead. It was just a "would be nice" type inquiry.
I don't see how that negates the need to post another version, because the intermediate diffs got too hard to follow.
It's not the first time capability changes cause conflicts and it won't be the last unless we come up with a better process for them.
What's wrong with the current process? The capabilities conflicts are trivial to resolve and we have automated tools for most of it (VIR_TEST_REGENRATE_OUTPUT, group-qemu-caps.pl, qemucapsfixreplies) Also, Andrea's series seems to be innocent in this - the removed capabilities do not alter .replies and the .[ch] file changes are contained to the middle of the capabilities array, so they should be resolved trivially by git. Jano
On 09/12/2018 06:24 PM, Ján Tomko wrote:
On Wed, Sep 12, 2018 at 09:45:32AM -0400, John Ferlan wrote:
On 09/12/2018 09:35 AM, Andrea Bolognani wrote:
On Wed, 2018-09-12 at 09:09 -0400, John Ferlan wrote:
Any chance this can wait? Would be nice to have other series posted upstream that have changes to .xml and .replies files to add new functionality be processed first.
There's a series to use - memfd from Marc-Andre Laurent that gets impacted.
* Lureau
right, my fingers not typing what I'm thinking, mea culpa.
I see you've already had to rebase locally to apply the patches at all, due to other changes being pushed in the meantime, so I don't see how pushing this series too would make it any worse.
Also IIUC you've asked Marc-André to make some changes that depend on *another series* of yours, that still hasn't been pushed, which means a respin will be necessary either way, won't it?
All in all I see no reason to dealy pushing this.
OK - go ahead. It was just a "would be nice" type inquiry.
I don't see how that negates the need to post another version, because the intermediate diffs got too hard to follow.
I don't see them as too hard to follow. In fact they're pretty simple as long as you have seen the code. I saw no need to request a repost unless it was because of the .replies differences. The hardest part is the move of the code from domain_conf to qemu_domain and since I requested and made those changes, I can see 'reason' to assist with adjusting the patches I was reviewing. Managing the capabilities conflict was less trivial and I certainly don't remember all the names of the various tools that were created that are supposed to help in the endeavor.
It's not the first time capability changes cause conflicts and it won't be the last unless we come up with a better process for them.
What's wrong with the current process?
1. It's not orderly. Review of upstream series is "ad-hoc" at best. Some series get immediate review, ack, and push. Sometimes certain series languish for no apparent reason. When those series contain capabilities changes it can quickly creates conflict. 2. At certain times there seems to be a "run" or "rush" to make capabilities changes based on priorities perhaps not related to upstream that create conflicts for patches that are languishing. 3. I think if we agree something is "good to add" capability wise and even though all the code isn't ready, the capability changes could go forward while perhaps the resolution of all review comments is handled. Yes, it's more of a problem when .replies changes.
The capabilities conflicts are trivial to resolve and we have automated tools for most of it (VIR_TEST_REGENRATE_OUTPUT, group-qemu-caps.pl, qemucapsfixreplies)
OK sometimes trivial to resolve... If one can keep up to date with changes or 'git am' doesn't have conflicts trying to apply changes. One has to go back in time with git checkout to a series before the update that caused the conflict, git apply patches, then --set-upstream-to=origin/master, and then git pull --rebase. And then you get to try to use any of the tools to help resolve conflicts - if you know about them and if they work; otherwise, it's a hand-edit or request to repost. Unless you know of some other neat trick or two... How would qemucapsfixreplies fix the environment where git am fails to do the merge. I didn't recall the name when processing the .replies files. I'm also not sure having taken a quick peak at the code whether it would have helped since there was "conflict" as a result of 4 replies being removed and 1 reply being added in a very similar spot in the file. As noted in the review - whenever I've created .replies files from scratch using the tools - something in my process doesn't create output in the exact format some seem to expect, so I've given up creating them and just wait for someone else to do it.
Also, Andrea's series seems to be innocent in this - the removed capabilities do not alter .replies and the .[ch] file changes are contained to the middle of the capabilities array, so they should be resolved trivially by git.
True... These were, but considering they were reviewed 16 minutes after posting and the previous series was reviewed similarly as quick and those caused merge conflict issues - I reacted to just the fact that capabilities changes were taking place and asked to consider the "orderly processing" of posted patches. I didn't dig into them because I was in the middle of something else. John
participants (3)
-
Andrea Bolognani -
John Ferlan -
Ján Tomko