External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_QXL_MAX_OUTPUTS and QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS

Browse Source 
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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-01-18 16:22:33 +01:00
parent d35ddc6243
commit 49a85978b7
46 changed files with 8 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_capabilities.c
View File

@ -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 */
@ -1494,12 +1494,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 },

4
src/qemu/qemu_capabilities.h
View File

@ -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 */

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
View File

@ -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'/>

16
tests/qemuxml2argvtest.c
View File

@ -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);

2
tests/qemuxml2xmltest.c
View File

@ -1241,13 +1241,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);