- tests: add test for a single per-device smmuv3 (RHEL-74200) - qemu: Use pci_bus to identify multi-smmuv3 model (RHEL-74200) - qemu: tpm: Account for possible migration without actually sharing storage (RHEL-132534) - tests: Test virFileIsSharedFSOverride (RHEL-102925) - util: Fix race condition in virFileIsSharedFSType (RHEL-102925) - util: Fix race condition in virFileIsSharedFSOverride (RHEL-102925) - util: Rework virFileIsSharedFSOverride using virFileCheckParents (RHEL-102925) Resolves: RHEL-102925, RHEL-132534, RHEL-74200
202 lines
8.6 KiB
Diff
202 lines
8.6 KiB
Diff
From d30c21439f3847ecc229db9355eb802f0256a3f0 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <d30c21439f3847ecc229db9355eb802f0256a3f0.1766070438.git.jdenemar@redhat.com>
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
Date: Fri, 5 Dec 2025 08:50:51 +0100
|
|
Subject: [PATCH] tests: add test for a single per-device smmuv3
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit 45ff1c002629dadd9d94b91742ffb985b0fe027f)
|
|
|
|
https://issues.redhat.com/browse/RHEL-74200
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
...-smmuv3-pci-bus-single.aarch64-latest.args | 40 +++++++++++++
|
|
...u-smmuv3-pci-bus-single.aarch64-latest.xml | 59 +++++++++++++++++++
|
|
.../iommu-smmuv3-pci-bus-single.xml | 46 +++++++++++++++
|
|
tests/qemuxmlconftest.c | 1 +
|
|
4 files changed, 146 insertions(+)
|
|
create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args
|
|
create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.xml
|
|
create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.xml
|
|
|
|
diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args
|
|
new file mode 100644
|
|
index 0000000000..976467e641
|
|
--- /dev/null
|
|
+++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args
|
|
@@ -0,0 +1,40 @@
|
|
+LC_ALL=C \
|
|
+PATH=/bin \
|
|
+HOME=/var/lib/libvirt/qemu/domain--1-guest \
|
|
+USER=test \
|
|
+LOGNAME=test \
|
|
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \
|
|
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \
|
|
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
|
|
+/usr/bin/qemu-system-aarch64 \
|
|
+-name guest=guest,debug-threads=on \
|
|
+-S \
|
|
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
|
|
+-machine virt,usb=off,gic-version=2,iommu=smmuv3,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \
|
|
+-accel tcg \
|
|
+-cpu cortex-a15 \
|
|
+-m size=1048576k \
|
|
+-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
|
|
+-overcommit mem-lock=off \
|
|
+-smp 1,sockets=1,cores=1,threads=1 \
|
|
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
|
|
+-display none \
|
|
+-no-user-config \
|
|
+-nodefaults \
|
|
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
|
|
+-mon chardev=charmonitor,id=monitor,mode=control \
|
|
+-rtc base=utc \
|
|
+-no-shutdown \
|
|
+-boot strict=on \
|
|
+-device '{"driver":"pxb-pcie","bus_nr":252,"id":"pci.1","bus":"pcie.0","addr":"0x1"}' \
|
|
+-device '{"driver":"pxb-pcie","bus_nr":248,"id":"pci.2","bus":"pcie.0","addr":"0x2"}' \
|
|
+-device '{"driver":"pcie-root-port","port":0,"chassis":21,"id":"pci.3","bus":"pci.1","addr":"0x0"}' \
|
|
+-device '{"driver":"pcie-root-port","port":168,"chassis":22,"id":"pci.4","bus":"pci.2","addr":"0x0"}' \
|
|
+-device '{"driver":"arm-smmuv3","primary-bus":"pci.1","id":"iommu0"}' \
|
|
+-audiodev '{"id":"audio1","driver":"none"}' \
|
|
+-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \
|
|
+-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.3","addr":"0x0"}' \
|
|
+-object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/urandom"}' \
|
|
+-device '{"driver":"virtio-rng-pci","rng":"objrng1","id":"rng1","bus":"pci.4","addr":"0x0"}' \
|
|
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
|
+-msg timestamp=on
|
|
diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.xml b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.xml
|
|
new file mode 100644
|
|
index 0000000000..e6071fd71b
|
|
--- /dev/null
|
|
+++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.xml
|
|
@@ -0,0 +1,59 @@
|
|
+<domain type='qemu'>
|
|
+ <name>guest</name>
|
|
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
|
|
+ <memory unit='KiB'>1048576</memory>
|
|
+ <currentMemory unit='KiB'>1048576</currentMemory>
|
|
+ <vcpu placement='static'>1</vcpu>
|
|
+ <os>
|
|
+ <type arch='aarch64' machine='virt'>hvm</type>
|
|
+ <boot dev='hd'/>
|
|
+ </os>
|
|
+ <features>
|
|
+ <gic version='2'/>
|
|
+ </features>
|
|
+ <cpu mode='custom' match='exact' check='none'>
|
|
+ <model fallback='forbid'>cortex-a15</model>
|
|
+ </cpu>
|
|
+ <clock offset='utc'/>
|
|
+ <on_poweroff>destroy</on_poweroff>
|
|
+ <on_reboot>restart</on_reboot>
|
|
+ <on_crash>destroy</on_crash>
|
|
+ <devices>
|
|
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
|
|
+ <controller type='usb' index='0' model='none'/>
|
|
+ <controller type='pci' index='0' model='pcie-root'/>
|
|
+ <controller type='pci' index='1' model='pcie-expander-bus'>
|
|
+ <model name='pxb-pcie'/>
|
|
+ <target busNr='252'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
|
+ </controller>
|
|
+ <controller type='pci' index='2' model='pcie-expander-bus'>
|
|
+ <model name='pxb-pcie'/>
|
|
+ <target busNr='248'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
|
+ </controller>
|
|
+ <controller type='pci' index='3' model='pcie-root-port'>
|
|
+ <model name='pcie-root-port'/>
|
|
+ <target chassis='21' port='0x0'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
|
+ </controller>
|
|
+ <controller type='pci' index='4' model='pcie-root-port'>
|
|
+ <model name='pcie-root-port'/>
|
|
+ <target chassis='22' port='0xa8'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
|
|
+ </controller>
|
|
+ <audio id='1' type='none'/>
|
|
+ <memballoon model='none'/>
|
|
+ <rng model='virtio'>
|
|
+ <backend model='random'>/dev/urandom</backend>
|
|
+ <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
|
|
+ </rng>
|
|
+ <rng model='virtio'>
|
|
+ <backend model='random'>/dev/urandom</backend>
|
|
+ <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
|
|
+ </rng>
|
|
+ <iommu model='smmuv3'>
|
|
+ <driver pciBus='1'/>
|
|
+ </iommu>
|
|
+ </devices>
|
|
+</domain>
|
|
diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.xml b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.xml
|
|
new file mode 100644
|
|
index 0000000000..6f40a19740
|
|
--- /dev/null
|
|
+++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.xml
|
|
@@ -0,0 +1,46 @@
|
|
+<domain type='qemu'>
|
|
+ <name>guest</name>
|
|
+ <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
|
|
+ <memory unit='KiB'>1048576</memory>
|
|
+ <vcpu placement='static'>1</vcpu>
|
|
+ <os>
|
|
+ <type arch='aarch64' machine='virt'>hvm</type>
|
|
+ </os>
|
|
+ <devices>
|
|
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
|
|
+ <controller type='usb' model='none'/>
|
|
+ <memballoon model='none'/>
|
|
+ <controller type='pci' index='0' model='pcie-root'/>
|
|
+ <controller type='pci' index='1' model='pcie-expander-bus'>
|
|
+ <model name='pxb-pcie'/>
|
|
+ <target busNr='252'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
|
+ </controller>
|
|
+ <controller type='pci' index='2' model='pcie-expander-bus'>
|
|
+ <model name='pxb-pcie'/>
|
|
+ <target busNr='248'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
|
+ </controller>
|
|
+ <controller type='pci' index='3' model='pcie-root-port'>
|
|
+ <model name='pcie-root-port'/>
|
|
+ <target chassis='21' port='0x0'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
|
+ </controller>
|
|
+ <controller type='pci' index='4' model='pcie-root-port'>
|
|
+ <model name='pcie-root-port'/>
|
|
+ <target chassis='22' port='0xa8'/>
|
|
+ <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
|
|
+ </controller>
|
|
+ <rng model='virtio'>
|
|
+ <backend model='random'>/dev/urandom</backend>
|
|
+ <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
|
|
+ </rng>
|
|
+ <rng model='virtio'>
|
|
+ <backend model='random'>/dev/urandom</backend>
|
|
+ <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
|
|
+ </rng>
|
|
+ <iommu model='smmuv3'>
|
|
+ <driver pciBus='1'/>
|
|
+ </iommu>
|
|
+ </devices>
|
|
+</domain>
|
|
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
|
|
index de03c58c8a..9a3257ea55 100644
|
|
--- a/tests/qemuxmlconftest.c
|
|
+++ b/tests/qemuxmlconftest.c
|
|
@@ -3039,6 +3039,7 @@ mymain(void)
|
|
DO_TEST_CAPS_LATEST_ABI_UPDATE("intel-iommu-eim-autoadd-v2");
|
|
DO_TEST_CAPS_ARCH_LATEST("iommu-smmuv3", "aarch64");
|
|
DO_TEST_CAPS_ARCH_LATEST("iommu-smmuv3-pci-bus", "aarch64");
|
|
+ DO_TEST_CAPS_ARCH_LATEST("iommu-smmuv3-pci-bus-single", "aarch64");
|
|
DO_TEST_CAPS_LATEST("virtio-iommu-x86_64");
|
|
DO_TEST_CAPS_ARCH_LATEST("virtio-iommu-aarch64", "aarch64");
|
|
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-wrong-machine");
|
|
--
|
|
2.52.0
|