External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-30 11:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuxml2xmltests.c: convert pseries tests to DO_TEST_CAPS_ARCH_LATEST

Browse Source 
qemuxml2xmltests that have "pseries" in the name now use the
DO_TEST_CAPS_LATEST_ARCH() macro.

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2022-05-21 11:54:56 -03:00
parent 9c495f8fcb
commit eca2a6cc92
28 changed files with 95 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemuxml2xmloutdata/panic-pseries.xml → tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml
View File

@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</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-ppc64</emulator>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>

1
tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml Symbolic link
View File

@ -0,0 +1 @@
pseries-serial-native.ppc64-latest.xml

1
tests/qemuxml2xmloutdata/pseries-console-native.xml
View File

@ -1 +0,0 @@
pseries-serial-native.xml

3
tests/qemuxml2xmloutdata/pseries-console-virtio.xml → tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

2
tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml → tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml
View File

@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>

2
tests/qemuxml2xmloutdata/pseries-cpu-compat.xml → tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml
View File

@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>

2
tests/qemuxml2xmloutdata/pseries-cpu-exact.xml → tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml
View File

@ -18,7 +18,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-ppc64</emulator>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>

3
tests/qemuxml2xmloutdata/pseries-features.xml → tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml
View File

@ -19,6 +19,9 @@
<sbbc value='broken'/>
<ibs value='fixed-ccd'/>
</features>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml → tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml → tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml → tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-many-buses-1.xml → tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-many-buses-2.xml → tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-many-devices.xml → tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

5
tests/qemuxml2xmloutdata/pseries-nvram.xml → tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml
View File

@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</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-ppc64</emulator>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>

5
tests/qemuxml2xmloutdata/pseries-panic-missing.xml → tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml
View File

@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</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-ppc64</emulator>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>

5
tests/qemuxml2xmloutdata/pseries-panic-no-address.xml → tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml
View File

@ -8,13 +8,16 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</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-ppc64</emulator>
<controller type='usb' index='0'>
<controller type='usb' index='0' model='pci-ohci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'>

11
tests/qemuxml2xmloutdata/pseries-phb-simple.xml → tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml
View File

@ -8,16 +8,15 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</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-ppc64</emulator>
<controller type='pci' index='0' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='0'/>
</controller>
<controller type='pci' index='1' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='1'/>
@ -27,6 +26,10 @@
<target index='2'/>
</controller>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='0'/>
</controller>
<audio id='1' type='none'/>
<memballoon model='none'/>
<panic model='pseries'/>

3
tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml → tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
View File

@ -12,7 +12,8 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
<topology sockets='2' dies='1' cores='1' threads='4'/>
<numa>
<cell id='0' cpus='0-3' memory='1048576' unit='KiB'/>

11
tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml → tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml
View File

@ -8,12 +8,19 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</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-ppc64</emulator>
<controller type='pci' index='0' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='0'/>
</controller>
<controller type='pci' index='1' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='1'/>
@ -23,10 +30,6 @@
<target index='2'/>
</controller>
<controller type='usb' index='0' model='none'/>
<controller type='pci' index='0' model='pci-root'>
<model name='spapr-pci-host-bridge'/>
<target index='0'/>
</controller>
<audio id='1' type='none'/>
<memballoon model='none'/>
<panic model='pseries'/>

1
tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml Symbolic link
View File

@ -0,0 +1 @@
pseries-serial-native.ppc64-latest.xml

1
tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
View File

@ -1 +0,0 @@
pseries-serial-native.xml

1
tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml Symbolic link
View File

@ -0,0 +1 @@
pseries-serial-native.ppc64-latest.xml

1
tests/qemuxml2xmloutdata/pseries-serial-compat.xml
View File

@ -1 +0,0 @@
pseries-serial-native.xml

3
tests/qemuxml2xmloutdata/pseries-serial-native.xml → tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-serial-pci.xml → tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

3
tests/qemuxml2xmloutdata/pseries-serial-usb.xml → tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml
View File

@ -8,6 +8,9 @@
<type arch='ppc64' machine='pseries'>hvm</type>
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
<model fallback='forbid'>POWER9</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>

99
tests/qemuxml2xmltest.c
View File

@ -691,77 +691,30 @@ mymain(void)
QEMU_CAPS_OBJECT_RNG_EGD);
DO_TEST_CAPS_LATEST("virtio-rng-builtin");
DO_TEST("pseries-nvram",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_DEVICE_NVRAM);
DO_TEST("pseries-panic-missing",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("pseries-panic-no-address",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST_CAPS_ARCH_LATEST("pseries-nvram", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-panic-missing", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-panic-no-address", "ppc64");
DO_TEST("pseries-phb-simple",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("pseries-phb-default-missing",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("pseries-phb-numa-node",
QEMU_CAPS_NUMA,
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE,
QEMU_CAPS_OBJECT_MEMORY_FILE);
DO_TEST_CAPS_ARCH_LATEST("pseries-phb-simple", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-phb-default-missing", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-phb-numa-node", "ppc64");
DO_TEST("pseries-many-devices",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("pseries-many-buses-1",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("pseries-many-buses-2",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("pseries-hostdevs-1",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("pseries-hostdevs-2",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("pseries-hostdevs-3",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST_CAPS_ARCH_LATEST("pseries-many-devices", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-many-buses-1", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-many-buses-2", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-1", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-2", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-3", "ppc64");
DO_TEST("pseries-features",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST,
QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC,
QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
QEMU_CAPS_MACHINE_PSERIES_CAP_IBS);
DO_TEST_CAPS_ARCH_LATEST("pseries-features", "ppc64");
DO_TEST("pseries-serial-native",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_DEVICE_SPAPR_VTY);
DO_TEST("pseries-serial+console-native",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_DEVICE_SPAPR_VTY);
DO_TEST("pseries-serial-compat",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_DEVICE_SPAPR_VTY);
DO_TEST("pseries-serial-pci",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_DEVICE_PCI_SERIAL);
DO_TEST("pseries-serial-usb",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_DEVICE_QEMU_XHCI,
QEMU_CAPS_DEVICE_USB_SERIAL);
DO_TEST("pseries-console-native",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
QEMU_CAPS_DEVICE_SPAPR_VTY);
DO_TEST("pseries-console-virtio",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST_CAPS_ARCH_LATEST("pseries-serial-native", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-serial+console-native", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-serial-compat", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-serial-pci", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-serial-usb", "ppc64");
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");
@ -1087,10 +1040,9 @@ mymain(void)
QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC);
DO_TEST("panic-pseries",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC);
DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC);
DO_TEST_CAPS_ARCH_LATEST("panic-pseries", "ppc64");
DO_TEST_NOCAPS("disk-backing-chains");
DO_TEST_NOCAPS("disk-backing-chains-index");
@ -1333,12 +1285,9 @@ mymain(void)
QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("smartcard-controller", QEMU_CAPS_CCID_EMULATED);
DO_TEST("pseries-cpu-compat-power9",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("pseries-cpu-compat",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST("pseries-cpu-exact",
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat-power9", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64");
DO_TEST("user-aliases",
QEMU_CAPS_DEVICE_CIRRUS_VGA,