qemu: Add capabilities for virtio-vga/gpu's max_outputs= parameter

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index fa8d026b21840f18f9412a275b14dc382baab6e1..e7ea6f47c7adf49fedb635075a12feb31391e6be 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -438,6 +438,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "vnc-multi-servers",
               "virtio-net.tx_queue_size",
               "chardev-reconnect",
+              "virtio-gpu.max_outputs",
     );
 
 
@@ -1787,6 +1788,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioGpu[] = {
     { "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL },
+    { "max_outputs", QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsICH9[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index eea5f109a3152afa52a404f9087697cf1c69a9e0..f32687d4ac41e3cb951ea3089ea8fb4e4f1450e9 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -424,6 +424,7 @@ typedef enum {
     QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=unix:/path */
     QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */
     QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */
+    QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-outputs= */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 5cd4772fdf4a6e33dd06cf305a93e8e39de74116..f97e4cb813395522567d75124ff17beaf97364bf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -187,6 +187,7 @@
   <flag name='kernel-irqchip'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2004000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 3ad458121b8ec9eb2164e2e902195b51d32332c6..2ba40fc494335f0162aa046ce6c8321026457233 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -193,6 +193,7 @@
   <flag name='kernel-irqchip'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2005000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index 032ffb08108ff8b4828a2ecd5d2da8e5ae5d7020..0b34fa30d47eca4b540227cd32518db30b0c776c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -171,6 +171,7 @@
   <flag name='kernel-irqchip.split'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index ce95a325ed6d0df8b45b31bea687d47d94937cdc..d41d578c7e2a745c9bf5aeebcb5811aa2c65a452 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -171,6 +171,7 @@
   <flag name='kernel-irqchip.split'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index 5f2ddf90d2d18be2a4466c47f427e5fd2b507204..f1c9fc98a432ea00fafead8dd2b6b7a4f500a922 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -166,6 +166,7 @@
   <flag name='spapr-pci-host-bridge'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index cfe04eda2953b1e98bcb53dd91ded1a84b2daea6..bdf006f6bec06ce41464e50bec5fc5551d367b3d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -203,6 +203,7 @@
   <flag name='kernel-irqchip.split'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2006000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 81189960ebdd7948b933e53e9deedf5f7fb55607..fe7bca93b909832a7868d4f0afe1a7d9b95f4242 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -133,6 +133,7 @@
   <flag name='kernel-irqchip.split'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index a388515bae8c6bda9b34eacae589b10dad92e726..3fd28f09fea735afe36b82591c89766aa1ab2404 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -206,6 +206,7 @@
   <flag name='intel-iommu.intremap'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2007000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.7.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 8b05c091ede5012ecd451df5b28a72e08561fda1..21bbb820d06c38f999893b1ddd3ba39c31f0799e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -135,6 +135,7 @@
   <flag name='kernel-irqchip.split'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2007093</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 18119a15becacf6221521326c97c7e56645894cd..761f9d1415ce574e559a7aa7f1bc14f15b09a823 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -208,6 +208,7 @@
   <flag name='intel-iommu.eim'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2008000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.8.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml
index 7d6af50fc913e1c345fa71e977c3286d6cb6c9a8..a373a6db61342eccb03df1b8d9237b17e215b3b1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml
@@ -171,6 +171,7 @@
   <flag name='spapr-pci-host-bridge.numa_node'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.9.0)</package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 7db2554d727c6f79c820f8daae2ed7568db2cc00..e80782cfbd6daba75736c6b9ffc14956e2dad8ef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -136,6 +136,7 @@
   <flag name='virtio.ats'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 028e596b6095a58c7a711868bc291bf76c170688..3641d03323e3a8d7d5fbd8ae3d83f21d1048c809 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -219,6 +219,7 @@
   <flag name='virtio.ats'/>
   <flag name='vnc-multi-servers'/>
   <flag name='chardev-reconnect'/>
+  <flag name='virtio-gpu.max_outputs'/>
   <version>2009000</version>
   <kvmVersion>0</kvmVersion>
   <package> (v2.9.0)</package>