qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_DISPLAY_OPTIONS

All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-02-01 17:35:17 +00:00 · 2022-11-07 15:02:05 +01:00 · 2022-11-07 15:02:05 +01:00 · f02190dc54
commit f02190dc54
parent b9f70ae05b
29 changed files with 0 additions and 29 deletions
--- 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 },
--- 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>
--- 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>
--- 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>
--- 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>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>
--- 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'/>