openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM 

The capability reflects whether QEMU is capable of -device
virtio-*,iommu_platform=. Since the property was introduced in
QEMU commit v2.9.0-rc0~162^2~37 we can safely assume the property
is always present as the minimal version required is 2.11.0.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2021-10-15 09:48:48 +02:00
parent 4b91b98889
commit 02c4c29823
42 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_capabilities.c
View File

@ -428,7 +428,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"intel-iommu.caching-mode", /* QEMU_CAPS_INTEL_IOMMU_CACHING_MODE */
"intel-iommu.eim", /* QEMU_CAPS_INTEL_IOMMU_EIM */
"intel-iommu.device-iotlb", /* QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB */
"virtio.iommu_platform", /* QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM */
"virtio.iommu_platform", /* X_QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM */
/* 260 */
"virtio.ats", /* QEMU_CAPS_VIRTIO_PCI_ATS */
@ -1378,7 +1378,6 @@ struct virQEMUCapsDevicePropsFlags {
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
{ "deflate-on-oom", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, NULL },
{ "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
{ "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
{ "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "free-page-reporting", QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING, NULL },
@ -1409,7 +1408,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
{ "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL },
{ "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
{ "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
{ "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
{ "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
{ "werror", QEMU_CAPS_STORAGE_WERROR, NULL },
@ -1423,7 +1421,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = {
{ "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL },
{ "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL },
{ "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
{ "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
{ "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL },
{ "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
@ -1445,7 +1442,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSpaprPCIHostBrid
static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
{ "iothread", QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, NULL },
{ "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
{ "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
{ "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
@ -1518,7 +1514,6 @@ 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 },
{ "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
{ "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
{ "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
{ "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },

2
src/qemu/qemu_capabilities.h
View File

@ -408,7 +408,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, /* intel-iommu.caching-mode */
QEMU_CAPS_INTEL_IOMMU_EIM, /* intel-iommu.eim */
QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB, /* intel-iommu.device-iotlb */
QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */
X_QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */
/* 260 */
QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */

8
src/qemu/qemu_validate.c
View File

@ -1569,14 +1569,6 @@ qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio,
if (!virtio)
return 0;
if (virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("the iommu setting is not supported "
"with this QEMU binary"));
return -1;
}
if (virtio->ats != VIR_TRISTATE_SWITCH_ABSENT &&
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_ATS)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

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

@ -59,7 +59,6 @@
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>

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

@ -132,7 +132,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -94,7 +94,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -88,7 +88,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>

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

@ -59,7 +59,6 @@
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>

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

@ -129,7 +129,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -87,7 +87,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>

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

@ -44,7 +44,6 @@
<flag name='vhost-scsi'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>

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

@ -44,7 +44,6 @@
<flag name='vhost-scsi'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='chardev-reconnect'/>
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>

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

@ -61,7 +61,6 @@
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>

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

@ -131,7 +131,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -88,7 +88,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>

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

@ -131,7 +131,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -96,7 +96,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -94,7 +94,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>

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

@ -100,7 +100,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -100,7 +100,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -61,7 +61,6 @@
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>

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

@ -130,7 +130,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -130,7 +130,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -98,7 +98,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -94,7 +94,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>

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

@ -61,7 +61,6 @@
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>

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

@ -131,7 +131,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -100,7 +100,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -96,7 +96,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>

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

@ -100,7 +100,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -131,7 +131,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -131,7 +131,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -100,7 +100,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -95,7 +95,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='spapr-pci-host-bridge'/>
<flag name='spapr-pci-host-bridge.numa_node'/>

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

@ -99,7 +99,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -60,7 +60,6 @@
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>

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

@ -131,7 +131,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -101,7 +101,6 @@
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='qemu-xhci'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -60,7 +60,6 @@
<flag name='query-cpu-definitions'/>
<flag name='block-write-threshold'/>
<flag name='query-named-block-nodes'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='loadparm'/>
<flag name='virtio-net.tx_queue_size'/>

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

@ -130,7 +130,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -129,7 +129,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>

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

@ -129,7 +129,6 @@
<flag name='intel-iommu.caching-mode'/>
<flag name='intel-iommu.eim'/>
<flag name='intel-iommu.device-iotlb'/>
<flag name='virtio.iommu_platform'/>
<flag name='virtio.ats'/>
<flag name='virtio-net.tx_queue_size'/>
<flag name='chardev-reconnect'/>