openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemuxml2xmltest: Modernize 'mach-virt*' cases 

Use real capabilities.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-24 16:40:53 +01:00
parent 4d0d31a6fd
commit bd4da926b1
8 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qemuxml2xmloutdata/mach-virt-console-native.xml → tests/qemuxml2xmloutdata/mach-virt-console-native.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<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>
@ -18,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<serial type='pty'>
<target type='system-serial' port='0'>
<model name='pl011'/>

16
tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml → tests/qemuxml2xmloutdata/mach-virt-console-virtio.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<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>
@ -18,8 +21,19 @@
<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='virtio-serial' index='0'>
<address type='virtio-mmio'/>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</controller>
<controller type='pci' index='1' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller>
<controller type='pci' index='2' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='2' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<console type='pty'>
<target type='virtio' port='0'/>

4
tests/qemuxml2xmloutdata/mach-virt-serial-native.xml → tests/qemuxml2xmloutdata/mach-virt-serial+console-native.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<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>
@ -18,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<serial type='pty'>
<target type='system-serial' port='0'>
<model name='pl011'/>

4
tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml → tests/qemuxml2xmloutdata/mach-virt-serial-compat.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<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>
@ -18,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<serial type='pty'>
<target type='system-serial' port='0'>
<model name='pl011'/>

4
tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml → tests/qemuxml2xmloutdata/mach-virt-serial-native.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<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>
@ -18,6 +21,7 @@
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<serial type='pty'>
<target type='system-serial' port='0'>
<model name='pl011'/>

19
tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml → tests/qemuxml2xmloutdata/mach-virt-serial-pci.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<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>
@ -19,19 +22,19 @@
<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='dmi-to-pci-bridge'>
<model name='i82801b11-bridge'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
<controller type='pci' index='1' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller>
<controller type='pci' index='2' model='pci-bridge'>
<model name='pci-bridge'/>
<target chassisNr='2'/>
<controller type='pci' index='2' model='pcie-to-pci-bridge'>
<model name='pcie-pci-bridge'/>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</controller>
<controller type='pci' index='3' model='pcie-root-port'>
<model name='pcie-root-port'/>
<target chassis='3' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
<target chassis='3' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<serial type='pty'>
<target type='pci-serial' port='0'>

3
tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml → tests/qemuxml2xmloutdata/mach-virt-serial-usb.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<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>

25
tests/qemuxml2xmltest.c
View File

@ -643,24 +643,13 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("pseries-console-native", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-console-virtio", "ppc64");
DO_TEST_NOCAPS("mach-virt-serial-native");
DO_TEST_NOCAPS("mach-virt-serial+console-native");
DO_TEST_NOCAPS("mach-virt-serial-compat");
DO_TEST("mach-virt-serial-pci",
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_SERIAL);
DO_TEST("mach-virt-serial-usb",
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_DEVICE_QEMU_XHCI,
QEMU_CAPS_DEVICE_USB_SERIAL);
DO_TEST("mach-virt-console-native",
QEMU_CAPS_DEVICE_PL011);
DO_TEST("mach-virt-console-virtio",
QEMU_CAPS_DEVICE_VIRTIO_MMIO);
DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-native", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial+console-native", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-compat", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-pci", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-usb", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-native", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-virtio", "aarch64");
DO_TEST_NOCAPS("balloon-device-auto");
DO_TEST_NOCAPS("balloon-device-period");