[PATCH 23/48] qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_DISPLAY_OPTIONS

All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2c28b91ad..55fafcec21 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1214,7 +1214,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, - { "query-display-options", QEMU_CAPS_QUERY_DISPLAY_OPTIONS }, { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN }, { "set-action", QEMU_CAPS_SET_ACTION }, { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index d00ebaa0aa..d240a0da7d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -121,7 +121,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 3d4b99246e..c766c0cf4a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -123,7 +123,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 05539c5822..2bd0530e5e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -85,7 +85,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 6a16855793..919f6363ba 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -162,7 +162,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 2f19631357..e380e137fb 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 3bde244867..9a689e43f6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -137,7 +137,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index a7b2645933..b6bf1b0509 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -123,7 +123,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 28a67ce62f..6fb38e874e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -169,7 +169,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 7bd777592f..48e001b60f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -50,7 +50,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='memory-backend-file.prealloc-threads'/> <version>5001000</version> <kvmVersion>0</kvmVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index bd38a09580..3f5577d84f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -171,7 +171,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> <flag name='memory-backend-file.prealloc-threads'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 02d5cbf811..1df8f486b2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -135,7 +135,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 7a8e1bfaf5..ff358bff1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -139,7 +139,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 543f8cccdb..06691ae0e7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -125,7 +125,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 2ff49c542f..06c4107783 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -92,7 +92,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index b712ba2f79..eaed31c884 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -172,7 +172,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> <flag name='piix4.acpi-root-pci-hotplug'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 7ad223562e..b26666c418 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -142,7 +142,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index ca14707e00..ee3e832914 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -98,7 +98,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='s390-pv-guest'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 1744f632e7..d8432886a2 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -179,7 +179,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 2cd81bf751..2236289dce 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 2b8ea4b605..954ad8d9c1 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -151,7 +151,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 387ff140c7..9bad8cf7d1 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -144,7 +144,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index e374621a44..ce275745f7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 08aa68581e..dee827f4ff 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -152,7 +152,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 84f38f5df2..88171e1312 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -157,7 +157,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index c2465fad4e..6a1116d28b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index a847b2ca19..96a71a19c6 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -153,7 +153,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 2192d1cef1..e41e456597 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 259769bd8a..7d93fce389 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> -- 2.37.4