[PATCH 0/5] qemu: Retire two virtio related capabilities
*** BLURB HERE *** Michal Prívozník (5): test: Drop unused .args or .xml files qemuxml2argvtest: Drop negative virtio-*-iommu tests qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM qemuxml2argvtest: Drop negative virtio-*-ats tests qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_ATS src/qemu/qemu_capabilities.c | 14 +----- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_validate.c | 16 ------ .../caps_2.11.0.s390x.xml | 2 - .../caps_2.11.0.x86_64.xml | 2 - .../caps_2.12.0.aarch64.xml | 2 - .../caps_2.12.0.ppc64.xml | 2 - .../caps_2.12.0.s390x.xml | 2 - .../caps_2.12.0.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 - .../caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 - .../caps_3.0.0.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 - .../caps_3.1.0.x86_64.xml | 2 - .../caps_4.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 - .../caps_4.0.0.riscv32.xml | 2 - .../caps_4.0.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 - .../caps_4.0.0.x86_64.xml | 2 - .../caps_4.1.0.x86_64.xml | 2 - .../caps_4.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 - .../caps_4.2.0.x86_64.xml | 2 - .../caps_5.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 - .../caps_5.0.0.riscv64.xml | 2 - .../caps_5.0.0.x86_64.xml | 2 - .../caps_5.1.0.x86_64.xml | 2 - .../caps_5.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 - .../caps_5.2.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 - .../caps_5.2.0.x86_64.xml | 2 - .../caps_6.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 - .../caps_6.0.0.x86_64.xml | 2 - .../caps_6.1.0.x86_64.xml | 2 - .../caps_6.2.0.x86_64.xml | 2 - .../luks-disks-source-qcow2.args | 49 ------------------- .../virtio-options-controller-ats.err | 1 - .../virtio-options-controller-iommu.err | 1 - .../virtio-options-disk-ats.err | 1 - .../virtio-options-disk-iommu.err | 1 - .../virtio-options-fs-ats.err | 1 - .../virtio-options-fs-iommu.err | 1 - .../virtio-options-input-ats.err | 1 - .../virtio-options-input-iommu.err | 1 - .../virtio-options-memballoon-ats.err | 1 - .../virtio-options-memballoon-iommu.err | 1 - .../virtio-options-net-ats.err | 1 - .../virtio-options-net-iommu.err | 1 - .../virtio-options-rng-ats.err | 1 - .../virtio-options-rng-iommu.err | 1 - .../virtio-options-video-ats.err | 1 - .../virtio-options-video-iommu.err | 1 - tests/qemuxml2argvtest.c | 26 ---------- .../qemuxml2xmloutdata/disk-virtio-queues.xml | 1 - tests/qemuxml2xmloutdata/panic-isa.xml | 41 ---------------- 62 files changed, 4 insertions(+), 239 deletions(-) delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.args delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.err delete mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.xml delete mode 100644 tests/qemuxml2xmloutdata/panic-isa.xml -- 2.32.0
There are a few files containing expected output for test cases that no longer exist. Remove them. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- .../luks-disks-source-qcow2.args | 49 ------------------- .../qemuxml2xmloutdata/disk-virtio-queues.xml | 1 - tests/qemuxml2xmloutdata/panic-isa.xml | 41 ---------------- 3 files changed, 91 deletions(-) delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.args delete mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.xml delete mode 100644 tests/qemuxml2xmloutdata/panic-isa.xml diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args deleted file mode 100644 index a0aa131ca5..0000000000 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args +++ /dev/null @@ -1,49 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-encryptdisk \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-x86_64 \ --name guest=encryptdisk,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 1024 \ --realtime mlock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --usb \ --object secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0 \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --object secret,id=virtio-disk1-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive file=/storage/guest_disks/encryptdisk2,encrypt.format=luks,encrypt.key-secret=virtio-disk1-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk1 \ --device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \ --object secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --object secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk2-auth-secret0,encrypt.format=luks,encrypt.key-secret=virtio-disk2-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk2 \ --device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \ --object secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=3,file.transport=tcp,encrypt.format=luks,encrypt.key-secret=virtio-disk3-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk3 \ --device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \ --object secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive 'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,encrypt.format=luks,encrypt.key-secret=virtio-disk4-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk4' \ --device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk4,id=virtio-disk4 \ --object secret,id=virtio-disk5-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ --drive file=/storage/guest_disks/encryptdisk5,encrypt.format=luks,encrypt.key-secret=virtio-disk5-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk5 \ --device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk5,id=virtio-disk5 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --msg timestamp=on diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml deleted file mode 120000 index d6773202b7..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/disk-virtio-queues.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml b/tests/qemuxml2xmloutdata/panic-isa.xml deleted file mode 100644 index e71386a886..0000000000 --- a/tests/qemuxml2xmloutdata/panic-isa.xml +++ /dev/null @@ -1,41 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i386</emulator> - <disk type='block' device='disk'> - <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='fdc' index='0'/> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </memballoon> - <panic model='isa'> - <address type='isa' iobase='0x505'/> - </panic> - </devices> -</domain> -- 2.32.0
On Fri, Oct 15, 2021 at 12:26:26 +0200, Michal Privoznik wrote:
There are a few files containing expected output for test cases that no longer exist. Remove them.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- .../luks-disks-source-qcow2.args | 49 ------------------- .../qemuxml2xmloutdata/disk-virtio-queues.xml | 1 - tests/qemuxml2xmloutdata/panic-isa.xml | 41 ---------------- 3 files changed, 91 deletions(-) delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.args delete mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.xml delete mode 100644 tests/qemuxml2xmloutdata/panic-isa.xml
Oops, those are leftover after my test cleanups. Reviewed-by: Peter Krempa <pkrempa@redhat.com>
There are some tests cases in qemuxml2argvtest that aim to check whether our validator rejects <driver iommu=''/> when QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM capability is not present. Well, such scenario can't happen really because the capability will always be present. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- .../virtio-options-controller-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-disk-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-fs-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-input-iommu.err | 1 - .../virtio-options-memballoon-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-net-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-rng-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-video-iommu.err | 1 - tests/qemuxml2argvtest.c | 13 ------------- 9 files changed, 21 deletions(-) delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.err diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.err b/tests/qemuxml2argvdata/virtio-options-controller-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.err b/tests/qemuxml2argvdata/virtio-options-disk-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.err b/tests/qemuxml2argvdata/virtio-options-fs-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.err b/tests/qemuxml2argvdata/virtio-options-input-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.err b/tests/qemuxml2argvdata/virtio-options-net-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.err b/tests/qemuxml2argvdata/virtio-options-rng-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.err b/tests/qemuxml2argvdata/virtio-options-video-iommu.err deleted file mode 100644 index 08908544fb..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the iommu setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6eb77ff884..595bc6e06c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3279,19 +3279,6 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options-net-packed"); DO_TEST_CAPS_LATEST("virtio-options-rng-packed"); DO_TEST_CAPS_LATEST("virtio-options-video-packed"); - DO_TEST_PARSE_ERROR("virtio-options-controller-iommu", QEMU_CAPS_VIRTIO_SCSI); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-iommu"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-iommu"); - DO_TEST_PARSE_ERROR("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_KEYBOARD); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-net-iommu"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-iommu"); - DO_TEST_PARSE_ERROR("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_PARSE_ERROR("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VHOST_USER_GPU); DO_TEST_PARSE_ERROR("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_SCSI); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-ats"); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-ats"); -- 2.32.0
On Fri, Oct 15, 2021 at 12:26:27 +0200, Michal Privoznik wrote:
There are some tests cases in qemuxml2argvtest that aim to check whether our validator rejects <driver iommu=''/> when QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM capability is not present. Well, such scenario can't happen really because the capability will always be present.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- .../virtio-options-controller-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-disk-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-fs-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-input-iommu.err | 1 - .../virtio-options-memballoon-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-net-iommu.err | 1 - tests/qemuxml2argvdata/virtio-options-rng-iommu.err | 1 - .../qemuxml2argvdata/virtio-options-video-iommu.err | 1 - tests/qemuxml2argvtest.c | 13 ------------- 9 files changed, 21 deletions(-) delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-iommu.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-iommu.err
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
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> --- src/qemu/qemu_capabilities.c | 7 +------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_validate.c | 8 -------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/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 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/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 | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/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 | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/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 | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/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 | 1 - tests/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 | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - 42 files changed, 2 insertions(+), 54 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 32be7e67f1..2ef3d06adb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -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 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5b5215416f..e33880eb4d 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -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 */ diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 4a82b512d1..d10ce0260c 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -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", diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 2bade882a4..48b6aade2a 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 2c432bff9e..05aeb23569 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 8a927796bc..8962df414c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index a68605f4dd..47cf22f97a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index b711c05eff..7cd20c3ef1 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 429c0c260e..35662b5fb5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 2e81e837a2..8cdbaba062 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 03efe118d5..4f1a2631d8 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 1df1ec8728..c917876949 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 19a9f31860..710f9c774c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index be1283d449..5f9eb70b01 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index d0d7e26055..32807908d8 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 738e781aae..d38eb4e27a 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 02fc0df0b3..b22b8380e7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index bc0cc57eec..b1eb54b228 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 2692dcbe6d..9dad572f9b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index e2bcfd788c..fff6ae23be 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index a57d2dbc09..f5abb5ae52 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 624dd5344b..18815717e9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 757cdf0504..aa0f3b5887 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index a466bc51b9..485488bf3e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index bb65c49f5d..3922b31689 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 8c10fa260d..33ef9b5467 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 28ba47afd7..6db2e4c6e3 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 920feb1f07..68beafe1fe 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index e97419a08b..f5806b4568 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index c6f183769e..c856c7ff0b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 4398da6599..dc68cdd220 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 40904c8803..dd9da53d7c 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 042060235e..9da266f179 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 61328e1987..59aece1186 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 5f7b02a396..29083ffcd8 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 3c653acbde..f25d57fe68 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index bd2dc77d21..dd0c27d0ec 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 0c897137a4..261c6ed281 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 5d75b2ef63..14aa449f52 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index dc0c01c25b..fb4b58d362 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 871e85a2d3..290a093101 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index e5b9bfce0b..b2b06bb807 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -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'/> -- 2.32.0
On Fri, Oct 15, 2021 at 12:26:28 +0200, Michal Privoznik wrote:
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>
There are some tests cases in qemuxml2argvtest that aim to check whether our validator rejects <driver ats=''/> when QEMU_CAPS_VIRTIO_PCI_ATS capability is not present. Well, such scenario can't happen really because the capability will always be present. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- .../virtio-options-controller-ats.err | 1 - tests/qemuxml2argvdata/virtio-options-disk-ats.err | 1 - tests/qemuxml2argvdata/virtio-options-fs-ats.err | 1 - tests/qemuxml2argvdata/virtio-options-input-ats.err | 1 - .../virtio-options-memballoon-ats.err | 1 - tests/qemuxml2argvdata/virtio-options-net-ats.err | 1 - tests/qemuxml2argvdata/virtio-options-rng-ats.err | 1 - tests/qemuxml2argvdata/virtio-options-video-ats.err | 1 - tests/qemuxml2argvtest.c | 13 ------------- 9 files changed, 21 deletions(-) delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-ats.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-ats.err diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.err b/tests/qemuxml2argvdata/virtio-options-controller-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.err b/tests/qemuxml2argvdata/virtio-options-disk-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.err b/tests/qemuxml2argvdata/virtio-options-fs-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.err b/tests/qemuxml2argvdata/virtio-options-input-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.err b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.err b/tests/qemuxml2argvdata/virtio-options-net-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.err b/tests/qemuxml2argvdata/virtio-options-rng-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.err b/tests/qemuxml2argvdata/virtio-options-video-ats.err deleted file mode 100644 index f1ae0949f6..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the ats setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 595bc6e06c..a0ee5f9943 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3279,19 +3279,6 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options-net-packed"); DO_TEST_CAPS_LATEST("virtio-options-rng-packed"); DO_TEST_CAPS_LATEST("virtio-options-video-packed"); - DO_TEST_PARSE_ERROR("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_SCSI); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-ats"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-ats"); - DO_TEST_PARSE_ERROR("virtio-options-input-ats", QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_KEYBOARD); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-ats"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-net-ats"); - DO_TEST_PARSE_ERROR("virtio-options-rng-ats", QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_PARSE_ERROR("virtio-options-video-ats", QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VHOST_USER_GPU); DO_TEST_PARSE_ERROR("virtio-options-controller-packed", QEMU_CAPS_VIRTIO_SCSI); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-packed"); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-packed"); -- 2.32.0
On Fri, Oct 15, 2021 at 12:26:29 +0200, Michal Privoznik wrote:
There are some tests cases in qemuxml2argvtest that aim to check whether our validator rejects <driver ats=''/> when QEMU_CAPS_VIRTIO_PCI_ATS capability is not present. Well, such scenario can't happen really because the capability will always be present.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
The capability reflects whether QEMU is capable of -device virtio-*,ats=. Since the property was introduced in QEMU commit v2.9.0-rc0~162^2~32 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> --- src/qemu/qemu_capabilities.c | 7 +------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_validate.c | 8 -------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/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 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/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 | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/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 | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/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 | 1 - tests/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 | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - 40 files changed, 2 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2ef3d06adb..1043c4b1e6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -431,7 +431,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio.iommu_platform", /* X_QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM */ /* 260 */ - "virtio.ats", /* QEMU_CAPS_VIRTIO_PCI_ATS */ + "virtio.ats", /* X_QEMU_CAPS_VIRTIO_PCI_ATS */ "loadparm", /* QEMU_CAPS_LOADPARM */ "spapr-pci-host-bridge", /* QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE */ "spapr-pci-host-bridge.numa_node", /* QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE */ @@ -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 }, - { "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 }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, @@ -1408,7 +1407,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 }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "werror", QEMU_CAPS_STORAGE_WERROR, NULL }, { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, @@ -1421,7 +1419,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 }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, @@ -1442,7 +1439,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 }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL }, { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, }; @@ -1514,7 +1510,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 }, - { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, 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 e33880eb4d..326e5259b4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -411,7 +411,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */ /* 260 */ - QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */ + X_QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */ QEMU_CAPS_LOADPARM, /* -machine loadparm */ QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-bridge */ QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, /* spapr-pci-host-bridge.numa_node= */ diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index d10ce0260c..dfe66b15da 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1569,14 +1569,6 @@ qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio, if (!virtio) return 0; - if (virtio->ats != VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_ATS)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("the ats setting is not supported with this " - "QEMU binary")); - return -1; - } - if (virtio->packed != VIR_TRISTATE_SWITCH_ABSENT && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PACKED_QUEUES)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 48b6aade2a..4d916121c5 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -59,7 +59,6 @@ <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <flag name='virtio.ats'/> <flag name='loadparm'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 05aeb23569..559bf16766 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -132,7 +132,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 8962df414c..0c646c9c24 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -94,7 +94,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 47cf22f97a..eb964e46d6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -88,7 +88,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='virtio-net.tx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 7cd20c3ef1..15a3e8724b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -59,7 +59,6 @@ <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <flag name='virtio.ats'/> <flag name='loadparm'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 35662b5fb5..745110142f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -129,7 +129,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 8cdbaba062..e287c85293 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -87,7 +87,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='virtio-net.tx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 710f9c774c..4d0be025fd 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -61,7 +61,6 @@ <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <flag name='virtio.ats'/> <flag name='loadparm'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 5f9eb70b01..5acce281b1 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 32807908d8..05d7921734 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -88,7 +88,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='virtio-net.tx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index d38eb4e27a..92b3b10147 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index b22b8380e7..3fe7332e19 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -96,7 +96,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index b1eb54b228..10f0d825e7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -94,7 +94,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='virtio-net.tx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 9dad572f9b..98f1dc041c 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -100,7 +100,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index fff6ae23be..88d0219e36 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -100,7 +100,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index f5abb5ae52..8e6ac7a8a9 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -61,7 +61,6 @@ <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <flag name='virtio.ats'/> <flag name='loadparm'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 18815717e9..28643ca67d 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -130,7 +130,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index aa0f3b5887..7a38f44dea 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -130,7 +130,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 485488bf3e..6cdc32dab3 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -98,7 +98,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 3922b31689..25e879b851 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -94,7 +94,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='virtio-net.tx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 33ef9b5467..beac3db473 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -61,7 +61,6 @@ <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <flag name='virtio.ats'/> <flag name='loadparm'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 6db2e4c6e3..d3dde76939 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 68beafe1fe..bb6a7d5ee7 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -100,7 +100,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index f5806b4568..f8317c1117 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -96,7 +96,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='virtio-net.tx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index c856c7ff0b..d8f9af8af2 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -100,7 +100,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index dc68cdd220..3e99e52962 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index dd9da53d7c..18b7897bfa 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 9da266f179..a995cd679a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -100,7 +100,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 59aece1186..ff21dc62d1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -95,7 +95,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='virtio-net.tx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 29083ffcd8..cd24a27615 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -99,7 +99,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index f25d57fe68..6766a701af 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -60,7 +60,6 @@ <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <flag name='virtio.ats'/> <flag name='loadparm'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index dd0c27d0ec..a51dab587d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 261c6ed281..6b92e34a6f 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -101,7 +101,6 @@ <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> <flag name='qemu-xhci'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 14aa449f52..1c04bb1a01 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -60,7 +60,6 @@ <flag name='query-cpu-definitions'/> <flag name='block-write-threshold'/> <flag name='query-named-block-nodes'/> - <flag name='virtio.ats'/> <flag name='loadparm'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index fb4b58d362..a1644efa0d 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -130,7 +130,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 290a093101..3e030e90c5 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -129,7 +129,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index b2b06bb807..41f6c1c460 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -129,7 +129,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio.ats'/> <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> -- 2.32.0
On Fri, Oct 15, 2021 at 12:26:30 +0200, Michal Privoznik wrote:
The capability reflects whether QEMU is capable of -device virtio-*,ats=. Since the property was introduced in QEMU commit v2.9.0-rc0~162^2~32 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>
participants (2)
-
Michal Privoznik -
Peter Krempa