External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2xmltest: Modernize all 'net-' tests

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-08-17 13:16:34 +02:00
parent bbb5666d61
commit dddff1a01c
11 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
View File

@ -8,6 +8,9 @@
<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>
@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>

5
tests/qemuxml2xmloutdata/net-bandwidth.xml → tests/qemuxml2xmloutdata/net-bandwidth.x86_64-latest.xml
View File

@ -15,6 +15,9 @@
<apic/>
<pae/>
</features>
<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>
@ -34,7 +37,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>

5
tests/qemuxml2xmloutdata/net-bandwidth2.xml → tests/qemuxml2xmloutdata/net-bandwidth2.x86_64-latest.xml
View File

@ -15,6 +15,9 @@
<apic/>
<pae/>
</features>
<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>
@ -27,7 +30,7 @@
<target dev='vda' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='virtio-serial' index='0'>

5
tests/qemuxml2xmloutdata/net-hostdev-vfio.xml → tests/qemuxml2xmloutdata/net-hostdev-vfio.x86_64-latest.xml
View File

@ -8,6 +8,9 @@
<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>
@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>

1
tests/qemuxml2xmloutdata/net-user-passt.xml
View File

@ -1 +0,0 @@
../qemuxml2argvdata/net-user-passt.xml

5
tests/qemuxml2xmloutdata/net-vdpa-multiqueue.xml → tests/qemuxml2xmloutdata/net-vdpa-multiqueue.x86_64-latest.xml
View File

@ -8,13 +8,16 @@
<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'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>

5
tests/qemuxml2xmloutdata/net-vdpa.xml → tests/qemuxml2xmloutdata/net-vdpa.x86_64-latest.xml
View File

@ -8,13 +8,16 @@
<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'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='ide' index='0'>

0
tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.xml → tests/qemuxml2xmloutdata/net-virtio-teaming-hostdev.x86_64-latest.xml
View File

5
tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml → tests/qemuxml2xmloutdata/net-virtio-teaming-network.x86_64-latest.xml
View File

@ -8,6 +8,9 @@
<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>
@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>

5
tests/qemuxml2xmloutdata/net-virtio-teaming.xml → tests/qemuxml2xmloutdata/net-virtio-teaming.x86_64-latest.xml
View File

@ -8,6 +8,9 @@
<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>
@ -20,7 +23,7 @@
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='piix3-uhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>

19
tests/qemuxml2xmltest.c
View File

@ -426,28 +426,25 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-eth-unmanaged-tap");
DO_TEST_CAPS_LATEST("net-virtio-network-portgroup");
DO_TEST_CAPS_LATEST("net-virtio-rxtxqueuesize");
DO_TEST("net-virtio-teaming",
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("net-virtio-teaming-network",
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("net-virtio-teaming-hostdev",
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST_CAPS_LATEST("net-virtio-teaming");
DO_TEST_CAPS_LATEST("net-virtio-teaming-network");
DO_TEST_CAPS_LATEST("net-virtio-teaming-hostdev");
DO_TEST_CAPS_LATEST("net-isolated-port");
DO_TEST_CAPS_LATEST("net-hostdev");
DO_TEST_CAPS_LATEST("net-hostdev-bootorder");
DO_TEST("net-hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST_CAPS_LATEST("net-hostdev-vfio");
DO_TEST_CAPS_LATEST("net-midonet");
DO_TEST_CAPS_LATEST("net-openvswitch");
DO_TEST_CAPS_LATEST("sound-device");
DO_TEST_CAPS_LATEST("watchdog");
DO_TEST_CAPS_LATEST("watchdog-q35-multiple");
DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC);
DO_TEST_CAPS_LATEST("net-bandwidth");
DO_TEST_CAPS_LATEST("net-bandwidth2");
DO_TEST_CAPS_LATEST("net-mtu");
DO_TEST_CAPS_LATEST("net-coalesce");
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-vdpa");
DO_TEST_CAPS_LATEST("net-vdpa-multiqueue");
DO_TEST_CAPS_LATEST("net-virtio-rss");
DO_TEST_CAPS_LATEST("serial-tcp-tlsx509-chardev");