mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-03 11:35:19 +00:00
tests: qemuxml2xml: Convert os-firmware* to TEST_CAPS
Convert these test cases to use DO_TEST_CAPS_LATEST * os-firmware-bios * os-firmware-efi * os-firmware-efi-secboot Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
parent
7339f4d79b
commit
ea5f33b73c
68
tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml
Normal file
68
tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
<domain type='kvm'>
|
||||||
|
<name>fedora</name>
|
||||||
|
<uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
|
||||||
|
<memory unit='KiB'>8192</memory>
|
||||||
|
<currentMemory unit='KiB'>8192</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os firmware='bios'>
|
||||||
|
<type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
|
||||||
|
<loader secure='no'/>
|
||||||
|
<nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram>
|
||||||
|
<boot dev='hd'/>
|
||||||
|
<bootmenu enable='yes'/>
|
||||||
|
</os>
|
||||||
|
<features>
|
||||||
|
<acpi/>
|
||||||
|
<apic/>
|
||||||
|
<pae/>
|
||||||
|
</features>
|
||||||
|
<clock offset='utc'/>
|
||||||
|
<on_poweroff>destroy</on_poweroff>
|
||||||
|
<on_reboot>restart</on_reboot>
|
||||||
|
<on_crash>restart</on_crash>
|
||||||
|
<pm>
|
||||||
|
<suspend-to-mem enabled='yes'/>
|
||||||
|
<suspend-to-disk enabled='no'/>
|
||||||
|
</pm>
|
||||||
|
<devices>
|
||||||
|
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||||
|
<controller type='usb' index='0' model='ich9-ehci1'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci1'>
|
||||||
|
<master startport='0'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci2'>
|
||||||
|
<master startport='2'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci3'>
|
||||||
|
<master startport='4'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='sata' index='0'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
|
||||||
|
</controller>
|
||||||
|
<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='0x1e' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='pci' index='2' model='pci-bridge'>
|
||||||
|
<model name='pci-bridge'/>
|
||||||
|
<target chassisNr='2'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='pci' index='3' model='pcie-root-port'>
|
||||||
|
<model name='ioh3420'/>
|
||||||
|
<target chassis='3' port='0x8'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<input type='mouse' bus='ps2'/>
|
||||||
|
<input type='keyboard' bus='ps2'/>
|
||||||
|
<memballoon model='virtio'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
|
||||||
|
</memballoon>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
||||||
@ -1 +0,0 @@
|
|||||||
../qemuxml2argvdata/os-firmware-bios.xml
|
|
||||||
@ -0,0 +1,68 @@
|
|||||||
|
<domain type='kvm'>
|
||||||
|
<name>fedora</name>
|
||||||
|
<uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
|
||||||
|
<memory unit='KiB'>8192</memory>
|
||||||
|
<currentMemory unit='KiB'>8192</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os firmware='efi'>
|
||||||
|
<type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
|
||||||
|
<loader secure='yes'/>
|
||||||
|
<nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram>
|
||||||
|
<boot dev='hd'/>
|
||||||
|
<bootmenu enable='yes'/>
|
||||||
|
</os>
|
||||||
|
<features>
|
||||||
|
<acpi/>
|
||||||
|
<apic/>
|
||||||
|
<pae/>
|
||||||
|
</features>
|
||||||
|
<clock offset='utc'/>
|
||||||
|
<on_poweroff>destroy</on_poweroff>
|
||||||
|
<on_reboot>restart</on_reboot>
|
||||||
|
<on_crash>restart</on_crash>
|
||||||
|
<pm>
|
||||||
|
<suspend-to-mem enabled='yes'/>
|
||||||
|
<suspend-to-disk enabled='no'/>
|
||||||
|
</pm>
|
||||||
|
<devices>
|
||||||
|
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||||
|
<controller type='usb' index='0' model='ich9-ehci1'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci1'>
|
||||||
|
<master startport='0'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci2'>
|
||||||
|
<master startport='2'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci3'>
|
||||||
|
<master startport='4'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='sata' index='0'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
|
||||||
|
</controller>
|
||||||
|
<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='0x1e' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='pci' index='2' model='pci-bridge'>
|
||||||
|
<model name='pci-bridge'/>
|
||||||
|
<target chassisNr='2'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='pci' index='3' model='pcie-root-port'>
|
||||||
|
<model name='ioh3420'/>
|
||||||
|
<target chassis='3' port='0x8'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<input type='mouse' bus='ps2'/>
|
||||||
|
<input type='keyboard' bus='ps2'/>
|
||||||
|
<memballoon model='virtio'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
|
||||||
|
</memballoon>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
||||||
@ -1 +0,0 @@
|
|||||||
../qemuxml2argvdata/os-firmware-efi-secboot.xml
|
|
||||||
68
tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml
Normal file
68
tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
<domain type='kvm'>
|
||||||
|
<name>fedora</name>
|
||||||
|
<uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
|
||||||
|
<memory unit='KiB'>8192</memory>
|
||||||
|
<currentMemory unit='KiB'>8192</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os firmware='efi'>
|
||||||
|
<type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
|
||||||
|
<loader secure='no'/>
|
||||||
|
<nvram>/var/lib/libvirt/qemu/nvram/fedora_VARS.fd</nvram>
|
||||||
|
<boot dev='hd'/>
|
||||||
|
<bootmenu enable='yes'/>
|
||||||
|
</os>
|
||||||
|
<features>
|
||||||
|
<acpi/>
|
||||||
|
<apic/>
|
||||||
|
<pae/>
|
||||||
|
</features>
|
||||||
|
<clock offset='utc'/>
|
||||||
|
<on_poweroff>destroy</on_poweroff>
|
||||||
|
<on_reboot>restart</on_reboot>
|
||||||
|
<on_crash>restart</on_crash>
|
||||||
|
<pm>
|
||||||
|
<suspend-to-mem enabled='yes'/>
|
||||||
|
<suspend-to-disk enabled='no'/>
|
||||||
|
</pm>
|
||||||
|
<devices>
|
||||||
|
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
||||||
|
<controller type='usb' index='0' model='ich9-ehci1'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x7'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci1'>
|
||||||
|
<master startport='0'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0' multifunction='on'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci2'>
|
||||||
|
<master startport='2'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x1'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci3'>
|
||||||
|
<master startport='4'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x2'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='sata' index='0'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
|
||||||
|
</controller>
|
||||||
|
<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='0x1e' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='pci' index='2' model='pci-bridge'>
|
||||||
|
<model name='pci-bridge'/>
|
||||||
|
<target chassisNr='2'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='pci' index='3' model='pcie-root-port'>
|
||||||
|
<model name='ioh3420'/>
|
||||||
|
<target chassis='3' port='0x8'/>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
|
||||||
|
</controller>
|
||||||
|
<input type='mouse' bus='ps2'/>
|
||||||
|
<input type='keyboard' bus='ps2'/>
|
||||||
|
<memballoon model='virtio'>
|
||||||
|
<address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
|
||||||
|
</memballoon>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
||||||
@ -1 +0,0 @@
|
|||||||
../qemuxml2argvdata/os-firmware-efi.xml
|
|
||||||
@ -1003,30 +1003,9 @@ mymain(void)
|
|||||||
DO_TEST("smbios", NONE);
|
DO_TEST("smbios", NONE);
|
||||||
DO_TEST("smbios-multiple-type2", NONE);
|
DO_TEST("smbios-multiple-type2", NONE);
|
||||||
|
|
||||||
DO_TEST("os-firmware-bios",
|
DO_TEST_CAPS_LATEST("os-firmware-bios");
|
||||||
QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
DO_TEST_CAPS_LATEST("os-firmware-efi");
|
||||||
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
DO_TEST_CAPS_LATEST("os-firmware-efi-secboot");
|
||||||
QEMU_CAPS_DEVICE_IOH3420,
|
|
||||||
QEMU_CAPS_ICH9_AHCI,
|
|
||||||
QEMU_CAPS_ICH9_USB_EHCI1,
|
|
||||||
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
||||||
QEMU_CAPS_DEVICE_QXL);
|
|
||||||
DO_TEST("os-firmware-efi",
|
|
||||||
QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
||||||
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
|
||||||
QEMU_CAPS_DEVICE_IOH3420,
|
|
||||||
QEMU_CAPS_ICH9_AHCI,
|
|
||||||
QEMU_CAPS_ICH9_USB_EHCI1,
|
|
||||||
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
||||||
QEMU_CAPS_DEVICE_QXL);
|
|
||||||
DO_TEST("os-firmware-efi-secboot",
|
|
||||||
QEMU_CAPS_DEVICE_PCI_BRIDGE,
|
|
||||||
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
|
|
||||||
QEMU_CAPS_DEVICE_IOH3420,
|
|
||||||
QEMU_CAPS_ICH9_AHCI,
|
|
||||||
QEMU_CAPS_ICH9_USB_EHCI1,
|
|
||||||
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
|
|
||||||
QEMU_CAPS_DEVICE_QXL);
|
|
||||||
|
|
||||||
DO_TEST("aarch64-aavmf-virtio-mmio",
|
DO_TEST("aarch64-aavmf-virtio-mmio",
|
||||||
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user