Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
...tel-iommu-caching-mode.x86_64-latest.args} | 15 ++++++---
...tel-iommu-device-iotlb.x86_64-latest.args} | 15 ++++++---
...rgs => intel-iommu-eim.x86_64-latest.args} | 15 ++++++---
.../qemuxml2argvdata/intel-iommu-machine.args | 26 ---------------
... => intel-iommu-machine.x86_64-2.6.0.args} | 9 +++--
.../qemuxml2argvdata/intel-iommu-machine.xml | 2 +-
...mu.args => intel-iommu.x86_64-latest.args} | 15 ++++++---
tests/qemuxml2argvtest.c | 33 ++++---------------
...ntel-iommu-caching-mode.x86_64-latest.xml} | 0
...ntel-iommu-device-iotlb.x86_64-latest.xml} | 0
....xml => intel-iommu-eim.x86_64-latest.xml} | 0
...l => intel-iommu-machine.x86_64-2.6.0.xml} | 0
...ommu.xml => intel-iommu.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 15 +++------
14 files changed, 58 insertions(+), 87 deletions(-)
rename tests/qemuxml2argvdata/{intel-iommu-device-iotlb.args => intel-iommu-caching-mode.x86_64-latest.args} (61%)
copy tests/qemuxml2argvdata/{intel-iommu-caching-mode.args => intel-iommu-device-iotlb.x86_64-latest.args} (61%)
rename tests/qemuxml2argvdata/{intel-iommu-eim.args => intel-iommu-eim.x86_64-latest.args} (62%)
delete mode 100644 tests/qemuxml2argvdata/intel-iommu-machine.args
rename tests/qemuxml2argvdata/{intel-iommu-caching-mode.args => intel-iommu-machine.x86_64-2.6.0.args} (73%)
rename tests/qemuxml2argvdata/{intel-iommu.args => intel-iommu.x86_64-latest.args} (62%)
rename tests/qemuxml2xmloutdata/{intel-iommu-caching-mode.xml => intel-iommu-caching-mode.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{intel-iommu-device-iotlb.xml => intel-iommu-device-iotlb.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{intel-iommu-eim.xml => intel-iommu-eim.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{intel-iommu-machine.xml => intel-iommu-machine.x86_64-2.6.0.xml} (100%)
rename tests/qemuxml2xmloutdata/{intel-iommu.xml => intel-iommu.x86_64-latest.xml} (100%)
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
similarity index 61%
rename from tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
rename to tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
index 66c4110e93..3c88f0e38f 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
@@ -8,20 +8,25 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
-no-user-config \
-nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device intel-iommu,intremap=on,device-iotlb=on
+-boot strict=on \
+-device intel-iommu,intremap=on,caching-mode=on \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
similarity index 61%
copy from tests/qemuxml2argvdata/intel-iommu-caching-mode.args
copy to tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
index 1d1f35a38d..ff201ec5e8 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
@@ -8,20 +8,25 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
-no-user-config \
-nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device intel-iommu,intremap=on,caching-mode=on
+-boot strict=on \
+-device intel-iommu,intremap=on,device-iotlb=on \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
similarity index 62%
rename from tests/qemuxml2argvdata/intel-iommu-eim.args
rename to tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
index 6e53b1cf96..53dee161a8 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
@@ -8,20 +8,25 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 288,sockets=288,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
-no-user-config \
-nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device intel-iommu,intremap=on,eim=on
+-boot strict=on \
+-device intel-iommu,intremap=on,eim=on \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu-machine.args b/tests/qemuxml2argvdata/intel-iommu-machine.args
deleted file mode 100644
index d6d6f0d5f6..0000000000
--- a/tests/qemuxml2argvdata/intel-iommu-machine.args
+++ /dev/null
@@ -1,26 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
--S \
--machine q35,accel=tcg,usb=off,dump-guest-core=off,iommu=on \
--m 214 \
--realtime mlock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args b/tests/qemuxml2argvdata/intel-iommu-machine.x86_64-2.6.0.args
similarity index 73%
rename from tests/qemuxml2argvdata/intel-iommu-caching-mode.args
rename to tests/qemuxml2argvdata/intel-iommu-machine.x86_64-2.6.0.args
index 1d1f35a38d..4ebb4d15d9 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
+++ b/tests/qemuxml2argvdata/intel-iommu-machine.x86_64-2.6.0.args
@@ -8,9 +8,11 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
-S \
--machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine pc-q35-2.6,accel=tcg,usb=off,dump-guest-core=off,iommu=on \
-m 214 \
-realtime mlock=off \
-smp 1,sockets=1,cores=1,threads=1 \
@@ -24,4 +26,5 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device intel-iommu,intremap=on,caching-mode=on
+-boot strict=on \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu-machine.xml b/tests/qemuxml2argvdata/intel-iommu-machine.xml
index 90aba16156..85027cd938 100644
--- a/tests/qemuxml2argvdata/intel-iommu-machine.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-machine.xml
@@ -5,7 +5,7 @@
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='x86_64' machine='q35'>hvm</type>
+ <type arch='x86_64' machine='pc-q35-2.6'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
similarity index 62%
rename from tests/qemuxml2argvdata/intel-iommu.args
rename to tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
index 0a5a49b847..b4c8ca30b2 100644
--- a/tests/qemuxml2argvdata/intel-iommu.args
+++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
@@ -8,20 +8,25 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
-no-user-config \
-nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--device intel-iommu
+-boot strict=on \
+-device intel-iommu \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index edc19ace6f..1c2a2b3905 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2806,33 +2806,12 @@ mymain(void)
QEMU_CAPS_USB_HUB);
DO_TEST("acpi-table", NONE);
- DO_TEST("intel-iommu",
- QEMU_CAPS_DEVICE_INTEL_IOMMU);
- DO_TEST("intel-iommu-machine",
- QEMU_CAPS_MACHINE_IOMMU);
- DO_TEST("intel-iommu-caching-mode",
- QEMU_CAPS_MACHINE_KERNEL_IRQCHIP,
- QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT,
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420,
- QEMU_CAPS_ICH9_AHCI,
- QEMU_CAPS_ICH9_USB_EHCI1,
- QEMU_CAPS_DEVICE_INTEL_IOMMU,
- QEMU_CAPS_INTEL_IOMMU_INTREMAP,
- QEMU_CAPS_INTEL_IOMMU_CACHING_MODE);
- DO_TEST("intel-iommu-eim",
- QEMU_CAPS_MACHINE_KERNEL_IRQCHIP,
- QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT,
- QEMU_CAPS_INTEL_IOMMU_INTREMAP,
- QEMU_CAPS_INTEL_IOMMU_EIM,
- QEMU_CAPS_DEVICE_INTEL_IOMMU);
- DO_TEST("intel-iommu-device-iotlb",
- QEMU_CAPS_MACHINE_KERNEL_IRQCHIP,
- QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT,
- QEMU_CAPS_INTEL_IOMMU_INTREMAP,
- QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB,
- QEMU_CAPS_DEVICE_INTEL_IOMMU);
+
+ DO_TEST_CAPS_LATEST("intel-iommu");
+ DO_TEST_CAPS_VER("intel-iommu-machine", "2.6.0");
+ DO_TEST_CAPS_LATEST("intel-iommu-caching-mode");
+ DO_TEST_CAPS_LATEST("intel-iommu-eim");
+ DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb");
DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
DO_TEST_PARSE_ERROR("cpu-hotplug-granularity",
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-caching-mode.xml b/tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/intel-iommu-caching-mode.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.xml b/tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-eim.xml b/tests/qemuxml2xmloutdata/intel-iommu-eim.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/intel-iommu-eim.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-eim.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.x86_64-2.6.0.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/intel-iommu-machine.xml
rename to tests/qemuxml2xmloutdata/intel-iommu-machine.x86_64-2.6.0.xml
diff --git a/tests/qemuxml2xmloutdata/intel-iommu.xml b/tests/qemuxml2xmloutdata/intel-iommu.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/intel-iommu.xml
rename to tests/qemuxml2xmloutdata/intel-iommu.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 3b4d7efa52..f11ded4fb3 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1202,16 +1202,11 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
DO_TEST("video-none-device", NONE);
- DO_TEST("intel-iommu",
- QEMU_CAPS_DEVICE_INTEL_IOMMU);
- DO_TEST("intel-iommu-machine",
- QEMU_CAPS_MACHINE_IOMMU);
- DO_TEST("intel-iommu-caching-mode",
- QEMU_CAPS_DEVICE_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
- QEMU_CAPS_DEVICE_IOH3420);
- DO_TEST("intel-iommu-eim", NONE);
- DO_TEST("intel-iommu-device-iotlb", NONE);
+ DO_TEST_CAPS_LATEST("intel-iommu");
+ DO_TEST_CAPS_VER("intel-iommu-machine", "2.6.0");
+ DO_TEST_CAPS_LATEST("intel-iommu-caching-mode");
+ DO_TEST_CAPS_LATEST("intel-iommu-eim");
+ DO_TEST_CAPS_LATEST("intel-iommu-device-iotlb");
DO_TEST("cpu-check-none", NONE);
DO_TEST("cpu-check-partial", NONE);
--
2.21.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
