qemu_capabilities: Add QEMU_CAPS_DISPLAY_RELOAD

The 'display-reload' QMP command was introduced in QEMU 6.0.0, so we add a compatible capability to check if target QEMU binary supports it. {"execute":"display-reload", "arguments":{"type": "vnc", "tls-certs": true}} The new QMP refer to: 9cc0765165 Signed-off-by: Zheng Yan <yanzheng759@huawei.com> Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2024-12-22 05:35:25 +00:00 · 2021-05-11 22:05:18 +08:00 · 2021-05-11 22:05:18 +08:00 · bec963f878
commit bec963f878
parent 51c14df967
27 changed files with 28 additions and 0 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -704,6 +704,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

              /* 455 */
              "blockjob.backing-mask-protocol", /* QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL */
+              "display-reload", /* QEMU_CAPS_DISPLAY_RELOAD */
    );


@ -1228,6 +1229,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
    { "calc-dirty-rate", QEMU_CAPS_CALC_DIRTY_RATE },
    { "query-stats", QEMU_CAPS_QUERY_STATS },
    { "query-stats-schemas", QEMU_CAPS_QUERY_STATS_SCHEMAS },
+    { "display-reload", QEMU_CAPS_DISPLAY_RELOAD },
 };

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

    /* 455 */
    QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL, /* backing-mask-protocol of block-commit/block-stream */
+    QEMU_CAPS_DISPLAY_RELOAD, /* 'display-reload' qmp command is supported */

    QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@ -134,6 +134,7 @@
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
+  <flag name='display-reload'/>
  <version>6000000</version>
  <microcodeVersion>61700242</microcodeVersion>
  <package>v6.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
@ -92,6 +92,7 @@
  <flag name='virtio-net.rss'/>
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
+  <flag name='display-reload'/>
  <version>6000000</version>
  <microcodeVersion>39100242</microcodeVersion>
  <package>qemu-6.0.0-20210517.1.4ff77070.fc33</package>
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@ -170,6 +170,7 @@
  <flag name='migration.blocked-reasons'/>
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
+  <flag name='display-reload'/>
  <version>6000000</version>
  <microcodeVersion>43100242</microcodeVersion>
  <package>v6.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@ -176,6 +176,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>6001000</version>
  <microcodeVersion>43100243</microcodeVersion>
  <package>v6.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@ -147,6 +147,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>6001050</version>
  <microcodeVersion>61700244</microcodeVersion>
  <package></package>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@ -136,6 +136,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>6002000</version>
  <microcodeVersion>42900244</microcodeVersion>
  <package>v6.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@ -178,6 +178,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>6002000</version>
  <microcodeVersion>43100244</microcodeVersion>
  <package>v6.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@ -155,6 +155,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>6002092</version>
  <microcodeVersion>61700243</microcodeVersion>
  <package>v7.0.0-rc2</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@ -155,6 +155,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>6002092</version>
  <microcodeVersion>61700243</microcodeVersion>
  <package>v7.0.0-rc2</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@ -154,6 +154,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>7000000</version>
  <microcodeVersion>42900243</microcodeVersion>
  <package>v7.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@ -184,6 +184,7 @@
  <flag name='virtio-crypto'/>
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
+  <flag name='display-reload'/>
  <version>7000000</version>
  <microcodeVersion>43100243</microcodeVersion>
  <package>v7.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@ -155,6 +155,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>7001000</version>
  <microcodeVersion>42900244</microcodeVersion>
  <package>v7.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@ -188,6 +188,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>7001000</version>
  <microcodeVersion>43100244</microcodeVersion>
  <package>v7.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@ -150,6 +150,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>7002000</version>
  <microcodeVersion>0</microcodeVersion>
  <package>qemu-7.2.0-6.fc37</package>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@ -192,6 +192,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>7002000</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v7.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@ -192,6 +192,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>7002000</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v7.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@ -138,6 +138,7 @@
  <flag name='pvpanic-pci'/>
  <flag name='virtio-gpu.blob'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>7002050</version>
  <microcodeVersion>0</microcodeVersion>
  <package>v7.2.0-333-g222059a0fc</package>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@ -196,6 +196,7 @@
  <flag name='rbd-encryption-layering'/>
  <flag name='rbd-encryption-luks-any'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>8000000</version>
  <microcodeVersion>43100244</microcodeVersion>
  <package>v8.0.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@ -119,6 +119,7 @@
  <flag name='qcow2-discard-no-unref'/>
  <flag name='run-with.async-teardown'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>8001000</version>
  <microcodeVersion>39100245</microcodeVersion>
  <package>v8.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@ -198,6 +198,7 @@
  <flag name='run-with.async-teardown'/>
  <flag name='virtio-blk-vhost-vdpa'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>8001000</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v8.1.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@ -163,6 +163,7 @@
  <flag name='run-with.async-teardown'/>
  <flag name='smp-clusters'/>
  <flag name='virtio-mem-pci.dynamic-memslots'/>
+  <flag name='display-reload'/>
  <version>8002000</version>
  <microcodeVersion>61700246</microcodeVersion>
  <package>v8.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@ -170,6 +170,7 @@
  <flag name='virtio-blk-vhost-vdpa'/>
  <flag name='smp-clusters'/>
  <flag name='virtio-mem-pci.dynamic-memslots'/>
+  <flag name='display-reload'/>
  <version>8002000</version>
  <microcodeVersion>0</microcodeVersion>
  <package>qemu-8.2.0-7.fc39</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@ -119,6 +119,7 @@
  <flag name='qcow2-discard-no-unref'/>
  <flag name='run-with.async-teardown'/>
  <flag name='smp-clusters'/>
+  <flag name='display-reload'/>
  <version>8002000</version>
  <microcodeVersion>39100246</microcodeVersion>
  <package>v8.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@ -200,6 +200,7 @@
  <flag name='virtio-blk-vhost-vdpa'/>
  <flag name='smp-clusters'/>
  <flag name='virtio-mem-pci.dynamic-memslots'/>
+  <flag name='display-reload'/>
  <version>8002000</version>
  <microcodeVersion>43100246</microcodeVersion>
  <package>v8.2.0</package>
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@ -202,6 +202,7 @@
  <flag name='smp-clusters'/>
  <flag name='virtio-mem-pci.dynamic-memslots'/>
  <flag name='blockjob.backing-mask-protocol'/>
+  <flag name='display-reload'/>
  <version>8002050</version>
  <microcodeVersion>43100245</microcodeVersion>
  <package>v8.2.0-952-g14639717bf</package>