[PATCH 02/24] qemuxml2(argv|xml)test: Modernize 'net-many-models' case
Peter Krempa
pkrempa at redhat.com
Thu Aug 17 11:41:22 UTC 2023
Use real latest capabilities.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
tests/qemuxml2argvdata/net-many-models.args | 41 ------------------
.../net-many-models.x86_64-latest.args | 43 +++++++++++++++++++
tests/qemuxml2argvdata/net-many-models.xml | 2 +-
tests/qemuxml2argvtest.c | 2 +-
....xml => net-many-models.x86_64-latest.xml} | 7 ++-
tests/qemuxml2xmltest.c | 2 +-
6 files changed, 51 insertions(+), 46 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/net-many-models.args
create mode 100644 tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
rename tests/qemuxml2xmloutdata/{net-many-models.xml => net-many-models.x86_64-latest.xml} (90%)
diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
deleted file mode 100644
index 4b7c1799c2..0000000000
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ /dev/null
@@ -1,41 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m size=219136k \
--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,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--netdev user,id=hostnet0 \
--device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--netdev user,id=hostnet1 \
--device vmxnet3,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
--netdev user,id=hostnet2 \
--device netfront,netdev=hostnet2,id=net2,mac=00:11:22:33:44:57,bus=pci.0,addr=0x4 \
--netdev user,id=hostnet3 \
--device virtio-net-pci,netdev=hostnet3,id=net3,mac=00:11:22:33:44:58,bus=pci.0,addr=0x5 \
--netdev user,id=hostnet4 \
--device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6 \
--netdev user,id=hostnet5 \
--device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7 \
--audiodev '{"id":"audio1","driver":"none"}' \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-many-models.x86_64-latest.args b/tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
new file mode 100644
index 0000000000..c6ecde421a
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-many-models.x86_64-latest.args
@@ -0,0 +1,43 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=219136k \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-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,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-netdev '{"type":"user","id":"hostnet0"}' \
+-device '{"driver":"idontexist","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \
+-netdev '{"type":"user","id":"hostnet1"}' \
+-device '{"driver":"vmxnet3","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:56","bus":"pci.0","addr":"0x3"}' \
+-netdev '{"type":"user","id":"hostnet2"}' \
+-device '{"driver":"netfront","netdev":"hostnet2","id":"net2","mac":"00:11:22:33:44:57","bus":"pci.0","addr":"0x4"}' \
+-netdev '{"type":"user","id":"hostnet3"}' \
+-device '{"driver":"virtio-net-pci","netdev":"hostnet3","id":"net3","mac":"00:11:22:33:44:58","bus":"pci.0","addr":"0x5"}' \
+-netdev '{"type":"user","id":"hostnet4"}' \
+-device '{"driver":"ne2k_pci","netdev":"hostnet4","id":"net4","mac":"00:11:22:33:44:58","bus":"pci.0","addr":"0x6"}' \
+-netdev '{"type":"user","id":"hostnet5"}' \
+-device '{"driver":"pcnet","netdev":"hostnet5","id":"net5","mac":"00:11:22:33:44:58","bus":"pci.0","addr":"0x7"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-many-models.xml b/tests/qemuxml2argvdata/net-many-models.xml
index 40fc5de06c..27b55ae99d 100644
--- a/tests/qemuxml2argvdata/net-many-models.xml
+++ b/tests/qemuxml2argvdata/net-many-models.xml
@@ -3,7 +3,7 @@
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<devices>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8e36a54d98..3191dcb7c7 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1403,7 +1403,7 @@ mymain(void)
DO_TEST_NOCAPS("net-eth-unmanaged-tap");
DO_TEST_NOCAPS("net-client");
DO_TEST_NOCAPS("net-server");
- DO_TEST_NOCAPS("net-many-models");
+ DO_TEST_CAPS_LATEST("net-many-models");
DO_TEST_NOCAPS("net-mcast");
DO_TEST_NOCAPS("net-udp");
DO_TEST("net-hostdev", QEMU_CAPS_DEVICE_VFIO_PCI);
diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml b/tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
similarity index 90%
rename from tests/qemuxml2xmloutdata/net-many-models.xml
rename to tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
index 156ad0f157..4942b6ab8d 100644
--- a/tests/qemuxml2xmloutdata/net-many-models.xml
+++ b/tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
@@ -5,15 +5,18 @@
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
- <type arch='i686' machine='pc'>hvm</type>
+ <type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</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-i386</emulator>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pci-root'/>
<interface type='user'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 5d5ab4cabe..14d083b467 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -456,7 +456,7 @@ mymain(void)
DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
DO_TEST_NOCAPS("net-mtu");
DO_TEST_NOCAPS("net-coalesce");
- DO_TEST_NOCAPS("net-many-models");
+ DO_TEST_CAPS_LATEST("net-many-models");
DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA);
DO_TEST("net-vdpa-multiqueue", QEMU_CAPS_NETDEV_VHOST_VDPA);
DO_TEST_CAPS_LATEST("net-virtio-rss");
--
2.41.0
More information about the libvir-list
mailing list