qemu: capabilities: Introduce QEMU_CAPS_QUERY_DISPLAY_OPTIONS

The command allows to query various display-related options. The absence of the command will be used to imply certain video-related capabilities before we would be able to detect them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com>
2025-01-21 20:15:17 +00:00 · 2021-06-15 11:31:35 +02:00 · 2021-06-15 11:31:35 +02:00 · 55ead2333f
commit 55ead2333f
parent c29bb0fbb6
28 changed files with 29 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -635,6 +635,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

              /* 405 */
              "confidential-guest-support",
+              "query-display-options",
    );


@ -1180,6 +1181,7 @@ 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 },
 };

 struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -615,6 +615,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

    /* 405 */
    QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT, /* -machine confidential-guest-support */
+    QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp command present */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -214,6 +214,7 @@
  <flag name='cpu-max'/>
  <flag name='vnc-opts'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>3000092</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -177,6 +177,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -184,6 +184,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -176,6 +176,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -176,6 +176,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -140,6 +140,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -222,6 +222,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100240</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -229,6 +229,7 @@
  <flag name='vnc-opts'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -192,6 +192,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -191,6 +191,7 @@
  <flag name='audiodev'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4001050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -153,6 +153,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -240,6 +240,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>4002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -202,6 +202,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -210,6 +210,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -196,6 +196,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -247,6 +247,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100241</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -111,6 +111,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -249,6 +249,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5001000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -206,6 +206,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>61700243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -212,6 +212,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>42900243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -198,6 +198,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>0</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -160,6 +160,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -250,6 +250,7 @@
  <flag name='blockdev-backup'/>
  <flag name='rotation-rate'/>
  <flag name='input-linux'/>
+  <flag name='query-display-options'/>
  <version>5002000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -166,6 +166,7 @@
  <flag name='acpi-index'/>
  <flag name='input-linux'/>
  <flag name='confidential-guest-support'/>
+  <flag name='query-display-options'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>39100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -257,6 +257,7 @@
  <flag name='acpi-index'/>
  <flag name='input-linux'/>
  <flag name='confidential-guest-support'/>
+  <flag name='query-display-options'/>
  <version>6000000</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100242</microcodeVersion>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -257,6 +257,7 @@
  <flag name='virtio-gpu-gl-pci'/>
  <flag name='virtio-vga-gl'/>
  <flag name='confidential-guest-support'/>
+  <flag name='query-display-options'/>
  <version>6000050</version>
  <kvmVersion>0</kvmVersion>
  <microcodeVersion>43100243</microcodeVersion>