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:
https://gitlab.com/qemu-project/qemu/-/commit/9cc07651655ee86eca41059f5ead8c4e5607c734

Signed-off-by: Zheng Yan <yanzheng759@huawei.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ab11a929a30290fcccdbfe88a9e69d784a412d38..60d9a57387b3f5efedbe95ad6f0f4b26da1b202f 100644 (file)
--- 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[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ef1ad2c01cd7e65b5717b95324a592f493086ec6..7cd85366eccf8933e21efbc804709c7a29e53726 100644 (file)
--- 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;

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index a1712233c514c8beb94adeaa9f5cb582ab3cacce..12f634f7b0fa36ee3bce508a4cd7251dc230be29 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
index 483962c83b2695d2ec50a529c93c98d6794b530f..94a8406f0addfa97b76c438aabb22a66e3d83379 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 294d6f3124dc77f6aa3c3a5b092bee4b423feece..68ec4ba25a0cdd88f6c45a939efff0985c39f6eb 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index d32ebf0c3b344d2f8142aa4271fc4162b63d2095..d79600bc7b32871b28fe5e5178b63b7b88c3fe00 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 7a12ed41c41bd131b1289174c14082151bd4899c..0071226a08698c4680b07e69a3ef1c1553f5f95e 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index fe1bffd49124e64e7395c153fa27655c53fbe4a1..dda56d92963bae30b53545475347cfc64b0ea2c7 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index ca9a784c72ce484213d6f71dcbea0dce1e27ed19..3e7835b72e50947d837238c46c0dc0ec14e66a6d 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index bca905987ae6bb563a8b824228969b130fb29172..b4d242ecbbb0b652d4c49b2a90dd82b5684794d0 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index 9c61b92c1e7a84a12deda3e7884fb3ff071046c4..493fd052de0ea28ace3c0c922be1bd4b77f8eb7a 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 047a867766f78b35658fa270a2b928e169d70d20..cc9de20f1db08faa9e6d931caee86705731f32bf 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 8caeba3773f0f64a665b3198d74af4aa53ade60a..c0be80d9bdf5d4c4dce32a8b8ad0e8aface41bc9 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 536524cf18eac77e9831f5b96588ab6600df5050..b19a1cae39f7c371bfc3134ba5e929d2f5c2033e 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 745776b14bc3f5cb83a262079459f554a35da97c..e03de1a785e0922fd4a0c28470fb505678198fe3 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index 127b8ee4c2e2edf456b5cd950da4d9941569f684..a51f56b3d8196cf9b55601ce244b29b694637967 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 40182131896a001071d46e7c3426ecb09e35e4ad..9e7fa098256221378a1a88080cbaac5cc8548c20 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index e43890fb68be7f8142a616a5110fdcfe6cd9928f..23595e2605cd563be18510cb51656dddb9e9f3e3 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index 89760450155861dadfe6817da91149feb5dfbae1..c8f91178f8f3af73b63c89b9f036ecb86c35dcaa 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 3095b2fdabed5560756ddb5f5a2f9ed6cd868056..3ee4094a3e8663f3249746dd6997f435a9aea31e 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index ea5eec043593d7c9173a131e99d9ca5471983136..014c5f62260528d11f1af2188f3a503db8e70ec4 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 6375f428a0f4abd8e076fe99ba762ae1fe3f4482..574e761c8133fff4819e03986ef9e185105468c0 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index bf5c80c84849d74e081843108e8af5c2f1bccd5c..f5c132348cec307fbf4389acaa0c599d67c4310b 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index e447d22434574048663e5f0416d7f32971fd4dbb..46e43fdd62d1c44464a24ba689bbc0a1d3b05f64 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
index bd413b61e7b6ab75afabcd660135c152f071d390..8ca3f0c4e84e36f7d32d0d0236f4eaccd16ca8aa 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
index c7969d9de5909a746ad32de47e45c91e579fb84d..4fba1e9b438f8015ce85bef71f757c44f8ad0b6f 100644 (file)
--- 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>

diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index 7bf13da1db0138933a04657680071827a642cb65..9ec81b10cad50e64dbe8785012d073162d730f55 100644 (file)
--- 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>