Both are supported by qemu-2.11 and later, so we don't have to check for
them explicitly.
Note that QXL is supported only on x86_64, thus on other arches only the
capability for 'virtio-gpu' is removed.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 6 ++----
src/qemu/qemu_capabilities.h | 4 ++--
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
.../qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
.../qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 -
.../qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 2 --
tests/qemuxml2argvtest.c | 16 ++++------------
tests/qemuxml2xmltest.c | 2 --
46 files changed, 8 insertions(+), 76 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a71d3b912f..6bb8fffda6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -379,7 +379,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"nec-usb-xhci-ports", /* QEMU_CAPS_NEC_USB_XHCI_PORTS */
"virtio-scsi-pci.iothread", /* QEMU_CAPS_VIRTIO_SCSI_IOTHREAD */
"name-guest", /* X_QEMU_CAPS_NAME_GUEST */
- "qxl.max_outputs", /* QEMU_CAPS_QXL_MAX_OUTPUTS */
+ "qxl.max_outputs", /* X_QEMU_CAPS_QXL_MAX_OUTPUTS */
"qxl-vga.max_outputs", /* X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS */
/* 225 */
@@ -441,7 +441,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 265 */
"virtio-net.tx_queue_size", /* QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE */
"chardev-reconnect", /* QEMU_CAPS_CHARDEV_RECONNECT */
- "virtio-gpu.max_outputs", /* QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS */
+ "virtio-gpu.max_outputs", /* X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS */
"vxhs", /* QEMU_CAPS_VXHS */
"virtio-blk.num-queues", /* QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES */
@@ -1496,12 +1496,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVmwareSvga[] = {
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQxl[] = {
{ "vgamem_mb", QEMU_CAPS_QXL_VGAMEM, NULL },
{ "vram64_size_mb", QEMU_CAPS_QXL_VRAM64, NULL },
- { "max_outputs", QEMU_CAPS_QXL_MAX_OUTPUTS, NULL },
};
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[] = {
{ "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL, NULL },
- { "max_outputs", QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, NULL },
{ "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
{ "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 2c1b6a99c4..7d42e3a714 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -358,7 +358,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
X_QEMU_CAPS_NAME_GUEST, /* -name guest= */
- QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
+ X_QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */
/* 225 */
@@ -420,7 +420,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 265 */
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= */
+ X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-outputs= */
QEMU_CAPS_VXHS, /* -drive file.driver=vxhs via query-qmp-schema */
QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 4d916121c5..86adb32202 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -62,7 +62,6 @@
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index ed9826504c..ab575cb2ee 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -106,7 +106,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -133,7 +132,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 0c646c9c24..150072f0d6 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -96,7 +96,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index eb964e46d6..05359247b5 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -92,7 +92,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 15a3e8724b..035d17681b 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -62,7 +62,6 @@
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 7f536db863..c90e0c73bf 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -130,7 +129,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index e287c85293..cef1659cf2 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -91,7 +91,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 4f1a2631d8..e15da432ee 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -45,7 +45,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='disk-share-rw'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index c917876949..aad775b589 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -45,7 +45,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='disk-share-rw'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 4d0be025fd..e751648332 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -64,7 +64,6 @@
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 24ebdf3bbf..10af446776 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -132,7 +131,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 05d7921734..ca2ce49684 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -92,7 +92,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index eedf55d677..654e9acca4 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -132,7 +131,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 3fe7332e19..8a1fbd1069 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -98,7 +98,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 10f0d825e7..086dd4b04a 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -98,7 +98,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 9ae7a9260a..a16bc7fac2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -101,7 +101,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index cbfdf4968e..f960e381a2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -101,7 +101,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 8e6ac7a8a9..2aec9b92dd 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -64,7 +64,6 @@
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 2e5947aff6..33735f14d0 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -131,7 +130,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 40ad314d29..6bb750d071 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -131,7 +130,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 6cdc32dab3..86c2445f45 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -100,7 +100,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 25e879b851..aa269ee0da 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -98,7 +98,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index beac3db473..ad6976dd1f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -64,7 +64,6 @@
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 415d12054b..290f50207a 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -132,7 +131,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index bb6a7d5ee7..4c1a37104c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -102,7 +102,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index f8317c1117..070d0f2982 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -100,7 +100,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 58c7eb6651..286049a8a6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -101,7 +101,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 69f49020e7..f563d672b4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -132,7 +131,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 578e16e8b0..2d0ef18147 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -132,7 +131,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index b943eaedaf..e809b95c43 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -102,7 +102,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index ec64e1cacf..0cbbffe4fb 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -99,7 +99,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index a11d15f91a..13a69678b3 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -100,7 +100,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 552e1d43c9..518bb7ab7f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -63,7 +63,6 @@
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index bcc262551a..64e7bc21f0 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -132,7 +131,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 0fefe64537..743f7d985b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -103,7 +103,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 61685066b8..b034ffd12a 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -63,7 +63,6 @@
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 0d6763e9a3..b213abb9a6 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -131,7 +130,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 228f397c67..d9bdcf9e92 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -103,7 +103,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -130,7 +129,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 6bf9933bc5..f200a7d4be 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -110,7 +110,6 @@
<flag name='qemu-xhci'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 06cd7fb396..2c8e5fe533 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -99,7 +99,6 @@
<flag name='spapr-pci-host-bridge.numa_node'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 75aaeed03c..103d00fddd 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -103,7 +103,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -130,7 +129,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 6b80e7817e..0753ac5c78 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -103,7 +103,6 @@
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
- <flag name='qxl.max_outputs'/>
<flag name='drive-detect-zeroes'/>
<flag name='intel-iommu'/>
<flag name='virtio-pci-disable-legacy'/>
@@ -130,7 +129,6 @@
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>
- <flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cc67d806e4..9d2de2a569 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2478,15 +2478,9 @@ mymain(void)
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_QXL_VGAMEM);
DO_TEST_CAPS_LATEST("video-qxl-sec-device-vram64");
- DO_TEST("video-qxl-heads",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_QXL_MAX_OUTPUTS);
- DO_TEST("video-vga-qxl-heads",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_QXL_MAX_OUTPUTS);
- DO_TEST("video-qxl-noheads",
- QEMU_CAPS_DEVICE_QXL,
- QEMU_CAPS_QXL_MAX_OUTPUTS);
+ DO_TEST("video-qxl-heads", QEMU_CAPS_DEVICE_QXL);
+ DO_TEST("video-vga-qxl-heads", QEMU_CAPS_DEVICE_QXL);
+ DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL);
DO_TEST("video-qxl-resolution",
QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_QXL_VGAMEM);
@@ -2509,8 +2503,7 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_GPU);
DO_TEST("video-virtio-vga",
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_DEVICE_VIRTIO_VGA,
- QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS);
+ QEMU_CAPS_DEVICE_VIRTIO_VGA);
DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl");
DO_TEST_CAPS_LATEST("video-bochs-display-device");
DO_TEST_CAPS_LATEST("video-ramfb-display-device");
@@ -3390,7 +3383,6 @@ mymain(void)
DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index fb438269b9..2b6124463b 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1252,13 +1252,11 @@ mymain(void)
DO_TEST("video-virtio-gpu-ccw",
QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
DO_TEST("video-virtio-gpu-ccw-auto",
QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
- QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
DO_TEST("video-none-device", QEMU_CAPS_VNC);
--
2.34.1
