shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

qemuxml2xmltest: Convert rest of 'aarch64' cases to real capabilities

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-03-24 16:48:38 +01:00
parent bd4da926b1
commit 962bf7c9a5
6 changed files with 31 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml → tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml
View File

@ -35,6 +35,7 @@
<controller type='virtio-serial' index='0'> <controller type='virtio-serial' index='0'>
<address type='virtio-mmio'/> <address type='virtio-mmio'/>
</controller> </controller>
<controller type='pci' index='0' model='pcie-root'/>
<interface type='user'> <interface type='user'>
<mac address='52:54:00:09:a4:37'/> <mac address='52:54:00:09:a4:37'/>
<model type='virtio'/> <model type='virtio'/>

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

@ -11,6 +11,9 @@
<features> <features>
<gic version='2'/> <gic version='2'/>
</features> </features>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>cortex-a15</model>
</cpu>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
@ -18,19 +21,19 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='pci' index='0' model='pcie-root'/> <controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1' model='dmi-to-pci-bridge'> <controller type='pci' index='1' model='pcie-root-port'>
<model name='i82801b11-bridge'/> <model name='pcie-root-port'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> <target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='2' model='pci-bridge'> <controller type='pci' index='2' model='pcie-to-pci-bridge'>
<model name='pci-bridge'/> <model name='pcie-pci-bridge'/>
<target chassisNr='2'/>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</controller> </controller>
<controller type='pci' index='3' model='pcie-root-port'> <controller type='pci' index='3' model='pcie-root-port'>
<model name='pcie-root-port'/> <model name='pcie-root-port'/>
<target chassis='3' port='0x10'/> <target chassis='3' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller> </controller>
<serial type='pty'> <serial type='pty'>
<log file='/tmp/log' append='on'/> <log file='/tmp/log' append='on'/>

3
tests/qemuxml2xmloutdata/aarch64-traditional-pci.xml → tests/qemuxml2xmloutdata/aarch64-traditional-pci.aarch64-latest.xml
View File

@ -11,6 +11,9 @@
<features> <features>
<gic version='2'/> <gic version='2'/>
</features> </features>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>cortex-a15</model>
</cpu>
<clock offset='utc'/> <clock offset='utc'/>
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>

22
tests/qemuxml2xmloutdata/aarch64-video-default.xml → tests/qemuxml2xmloutdata/aarch64-video-default.aarch64-latest.xml
View File

@ -21,19 +21,15 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='pci' index='0' model='pcie-root'/> <controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1' model='dmi-to-pci-bridge'> <controller type='pci' index='1' model='pcie-root-port'>
<model name='i82801b11-bridge'/> <model name='pcie-root-port'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> <target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='2' model='pci-bridge'> <controller type='pci' index='2' model='pcie-root-port'>
<model name='pci-bridge'/> <model name='pcie-root-port'/>
<target chassisNr='2'/> <target chassis='2' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
</controller>
<controller type='pci' index='3' model='pcie-root-port'>
<model name='ioh3420'/>
<target chassis='3' port='0x10'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</controller> </controller>
<graphics type='vnc' port='-1' autoport='yes'> <graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/> <listen type='address'/>
@ -41,7 +37,7 @@
<audio id='1' type='none'/> <audio id='1' type='none'/>
<video> <video>
<model type='virtio' heads='1' primary='yes'/> <model type='virtio' heads='1' primary='yes'/>
<address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</video> </video>
</devices> </devices>
</domain> </domain>

4
tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml → tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.aarch64-latest.xml
View File

@ -21,12 +21,12 @@
<emulator>/usr/bin/qemu-system-aarch64</emulator> <emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='pci' index='0' model='pcie-root'/> <controller type='pci' index='0' model='pcie-root'/>
<controller type='pci' index='1' model='pcie-root-port'> <controller type='pci' index='1' model='pcie-root-port'>
<model name='ioh3420'/> <model name='pcie-root-port'/>
<target chassis='1' port='0x8'/> <target chassis='1' port='0x8'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
</controller> </controller>
<controller type='pci' index='2' model='pcie-root-port'> <controller type='pci' index='2' model='pcie-root-port'>
<model name='ioh3420'/> <model name='pcie-root-port'/>
<target chassis='2' port='0x9'/> <target chassis='2' port='0x9'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1' multifunction='on'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1' multifunction='on'/>
</controller> </controller>

32
tests/qemuxml2xmltest.c
View File

@ -920,35 +920,13 @@ mymain(void)
DO_TEST_NOCAPS("smbios-multiple-type2"); DO_TEST_NOCAPS("smbios-multiple-type2");
DO_TEST_NOCAPS("smbios-type-fwcfg"); DO_TEST_NOCAPS("smbios-type-fwcfg");
DO_TEST("aarch64-aavmf-virtio-mmio", DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64");
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64");
DO_TEST("aarch64-video-virtio-gpu-pci", DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64");
QEMU_CAPS_OBJECT_GPEX, DO_TEST_CAPS_ARCH_LATEST("aarch64-pci-serial", "aarch64");
QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, DO_TEST_CAPS_ARCH_LATEST("aarch64-traditional-pci", "aarch64");
QEMU_CAPS_DEVICE_VIRTIO_GPU); DO_TEST_CAPS_ARCH_LATEST("aarch64-video-default", "aarch64");
DO_TEST("aarch64-pci-serial",
QEMU_CAPS_DEVICE_PCI_SERIAL,
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT);
DO_TEST("aarch64-traditional-pci",
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_SERIAL);
DO_TEST("aarch64-video-default",
QEMU_CAPS_OBJECT_GPEX,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_VNC);
DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", WHEN_BOTH, DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", WHEN_BOTH,
ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest",