qemuxml2(argv|xml)test: Modernize 'net-many-models' case

Use real latest capabilities.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
deleted file mode 100644 (file)
index 4b7c179..0000000
--- 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 (file)
index 0000000..c6ecde4
--- /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 40fc5de06cffca2a75040f75657f7f0651606db1..27b55ae99d7df66aa895eeaf9abb3c29977ecc14 100644 (file)
--- 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 995b588df34409f40ccf56029f1db9d8a4028c70..a0360c284d8f174ff203657d8982d730ba73285a 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1440,7 +1440,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.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
new file mode 100644 (file)
index 0000000..4942b6a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-many-models.x86_64-latest.xml
@@ -0,0 +1,57 @@
+<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='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-x86_64</emulator>
+    <controller type='usb' index='0' model='none'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:55'/>
+      <model type='idontexist'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:56'/>
+      <model type='vmxnet3'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:57'/>
+      <model type='netfront'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='ne2k_pci'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='pcnet'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
+    </interface>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>

diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml b/tests/qemuxml2xmloutdata/net-many-models.xml
deleted file mode 100644 (file)
index 156ad0f..0000000
--- a/tests/qemuxml2xmloutdata/net-many-models.xml
+++ /dev/null
@@ -1,54 +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>
-    <controller type='usb' index='0' model='none'/>
-    <controller type='pci' index='0' model='pci-root'/>
-    <interface type='user'>
-      <mac address='00:11:22:33:44:55'/>
-      <model type='idontexist'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </interface>
-    <interface type='user'>
-      <mac address='00:11:22:33:44:56'/>
-      <model type='vmxnet3'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </interface>
-    <interface type='user'>
-      <mac address='00:11:22:33:44:57'/>
-      <model type='netfront'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-    </interface>
-    <interface type='user'>
-      <mac address='00:11:22:33:44:58'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
-    </interface>
-    <interface type='user'>
-      <mac address='00:11:22:33:44:58'/>
-      <model type='ne2k_pci'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
-    </interface>
-    <interface type='user'>
-      <mac address='00:11:22:33:44:58'/>
-      <model type='pcnet'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='none'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index e1d04f958af0ac4253041ae55fd9c100a083f043..6426a25536802efc2c8697a7f91c7d9248e16fc1 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -459,7 +459,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");