External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2xmltest: Modernize 'aarch64-gic*' test cases

Browse Source 
Use real capabilities for them.

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:47:03 +01:00
parent 0e550e7175
commit 74d4876d20
16 changed files with 150 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml → tests/qemuxml2xmloutdata/aarch64-gic-default-both.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

1
tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml → tests/qemuxml2xmloutdata/aarch64-gic-default-v2.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

1
tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml → tests/qemuxml2xmloutdata/aarch64-gic-default-v3.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

1
tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml → tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

25
tests/qemuxml2xmloutdata/aarch64-gic-default.xml
View File

@ -1,25 +0,0 @@
<domain type='kvm'>
<name>aarch64test</name>
<uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='aarch64' machine='virt'>hvm</type>
<boot dev='hd'/>
</os>
<features>
<gic version='2'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<audio id='1' type='none'/>
<memballoon model='none'/>
</devices>
</domain>

1
tests/qemuxml2xmloutdata/aarch64-gic-host.xml → tests/qemuxml2xmloutdata/aarch64-gic-host.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

1
tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml → tests/qemuxml2xmloutdata/aarch64-gic-none-both.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

1
tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml → tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.aarch64-latest.xml
View File

@ -21,6 +21,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

1
tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml → tests/qemuxml2xmloutdata/aarch64-gic-none-v2.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

26
tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml Normal file
View File

@ -0,0 +1,26 @@
<domain type='kvm'>
<name>aarch64test</name>
<uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='aarch64' machine='virt'>hvm</type>
<boot dev='hd'/>
</os>
<features>
<gic version='3'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/>
<memballoon model='none'/>
</devices>
</domain>

26
tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml Normal file
View File

@ -0,0 +1,26 @@
<domain type='kvm'>
<name>aarch64test</name>
<uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='aarch64' machine='virt'>hvm</type>
<boot dev='hd'/>
</os>
<features>
<gic version='3'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/>
<memballoon model='none'/>
</devices>
</domain>

1
tests/qemuxml2xmloutdata/aarch64-gic-none.xml → tests/qemuxml2xmloutdata/aarch64-gic-v2.aarch64-latest.xml
View File

@ -19,6 +19,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/> <controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/> <audio id='1' type='none'/>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>

25
tests/qemuxml2xmloutdata/aarch64-gic-v2.xml
View File

@ -1,25 +0,0 @@
<domain type='kvm'>
<name>aarch64test</name>
<uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='aarch64' machine='virt'>hvm</type>
<boot dev='hd'/>
</os>
<features>
<gic version='2'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<audio id='1' type='none'/>
<memballoon model='none'/>
</devices>
</domain>

26
tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml Normal file
View File

@ -0,0 +1,26 @@
<domain type='kvm'>
<name>aarch64test</name>
<uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='aarch64' machine='virt'>hvm</type>
<boot dev='hd'/>
</os>
<features>
<gic version='3'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/>
<memballoon model='none'/>
</devices>
</domain>

25
tests/qemuxml2xmloutdata/aarch64-gic-v3.xml
View File

@ -1,25 +0,0 @@
<domain type='kvm'>
<name>aarch64test</name>
<uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
<memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>1048576</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='aarch64' machine='virt'>hvm</type>
<boot dev='hd'/>
</os>
<features>
<gic version='3'/>
</features>
<cpu mode='host-passthrough' check='none'/>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='usb' index='0' model='none'/>
<audio id='1' type='none'/>
<memballoon model='none'/>
</devices>
</domain>

84
tests/qemuxml2xmltest.c
View File

@ -961,27 +961,69 @@ mymain(void)
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_VNC); QEMU_CAPS_VNC);
DO_TEST_FULL("aarch64-gic-none", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", WHEN_BOTH,
DO_TEST_FULL("aarch64-gic-none-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
DO_TEST_FULL("aarch64-gic-none-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); ARG_GIC, GIC_NONE, ARG_END);
DO_TEST_FULL("aarch64-gic-none-both", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); DO_TEST_FULL("aarch64-gic-none-v2", ".aarch64-latest", WHEN_BOTH,
DO_TEST_FULL("aarch64-gic-none-tcg", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
DO_TEST_FULL("aarch64-gic-default", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); ARG_GIC, GIC_V2, ARG_END);
DO_TEST_FULL("aarch64-gic-default-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); DO_TEST_FULL("aarch64-gic-none-v3", ".aarch64-latest", WHEN_BOTH,
DO_TEST_FULL("aarch64-gic-default-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
DO_TEST_FULL("aarch64-gic-default-both", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); ARG_GIC, GIC_V3, ARG_END);
DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); DO_TEST_FULL("aarch64-gic-none-both", ".aarch64-latest", WHEN_BOTH,
DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); ARG_GIC, GIC_BOTH, ARG_END);
DO_TEST_FULL("aarch64-gic-v2", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); DO_TEST_FULL("aarch64-gic-none-tcg", ".aarch64-latest", WHEN_BOTH,
DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); ARG_GIC, GIC_BOTH, ARG_END);
DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); DO_TEST_FULL("aarch64-gic-default", ".aarch64-latest", WHEN_BOTH,
DO_TEST_FULL("aarch64-gic-v3", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_NONE, ARG_END); ARG_GIC, GIC_NONE, ARG_END);
DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V2, ARG_END); DO_TEST_FULL("aarch64-gic-default-v2", ".aarch64-latest", WHEN_BOTH,
DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_V3, ARG_END); ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
DO_TEST_FULL("aarch64-gic-host", "", WHEN_BOTH, ARG_GIC, GIC_BOTH, ARG_END); ARG_GIC, GIC_V2, ARG_END);
DO_TEST_FULL("aarch64-gic-default-v3", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_V3, ARG_END);
DO_TEST_FULL("aarch64-gic-default-both", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_BOTH, ARG_END);
DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_NONE, ARG_END);
DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_V2, ARG_END);
DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_V3, ARG_END);
DO_TEST_FULL("aarch64-gic-v2", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_BOTH, ARG_END);
DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_NONE, ARG_END);
DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_V2, ARG_END);
DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_V3, ARG_END);
DO_TEST_FULL("aarch64-gic-v3", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_BOTH, ARG_END);
DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_NONE, ARG_END);
DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_V2, ARG_END);
DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_V3, ARG_END);
DO_TEST_FULL("aarch64-gic-host", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",
ARG_GIC, GIC_BOTH, ARG_END);
/* SVE aarch64 CPU features work on modern QEMU */ /* SVE aarch64 CPU features work on modern QEMU */
DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64");