mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-22 20:45:18 +00:00
qemuxml2xmltest: Modernize all test cases using QEMU_CAPS_QCOW2_LUKS
Modernize 'disk-nvme', 'encrypted-disk-usage', 'encrypted-disk', and 'user-aliases' cases to use DO_TEST_CAPS_LATEST. This will remove all uses of QEMU_CAPS_QCOW2_LUKS from the test suite. Since the output files are done via symlinks to input files, the input files need to be modernized with few auto-added XML bits. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
cd2d9808db
commit
8eae01ba28
@ -8,6 +8,9 @@
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<cpu mode='custom' match='exact' check='none'>
|
||||
<model fallback='forbid'>qemu64</model>
|
||||
</cpu>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
@ -49,7 +52,7 @@
|
||||
<target dev='vdd' bus='virtio'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'>
|
||||
<controller type='usb' index='0' model='piix3-uhci'>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
||||
</controller>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
||||
|
@ -8,6 +8,9 @@
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<cpu mode='custom' match='exact' check='none'>
|
||||
<model fallback='forbid'>qemu64</model>
|
||||
</cpu>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
@ -23,7 +26,7 @@
|
||||
</encryption>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'>
|
||||
<controller type='usb' index='0' model='piix3-uhci'>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
||||
</controller>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
||||
|
@ -19,7 +19,8 @@
|
||||
<apic/>
|
||||
<pae/>
|
||||
</features>
|
||||
<cpu>
|
||||
<cpu mode='custom' match='exact' check='none'>
|
||||
<model fallback='forbid'>qemu64</model>
|
||||
<numa>
|
||||
<cell id='0' cpus='0' memory='1048576' unit='KiB'/>
|
||||
<cell id='1' cpus='1' memory='1048576' unit='KiB'/>
|
||||
@ -70,7 +71,7 @@
|
||||
<alias name='ua-WhatAnAwesomeCDROM'/>
|
||||
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'>
|
||||
<controller type='usb' index='0' model='piix3-uhci'>
|
||||
<alias name='ua-SomeWeirdController'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
||||
</controller>
|
||||
|
@ -8,6 +8,9 @@
|
||||
<type arch='x86_64' machine='pc'>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<cpu mode='custom' match='exact' check='none'>
|
||||
<model fallback='forbid'>qemu64</model>
|
||||
</cpu>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
@ -23,7 +26,7 @@
|
||||
</encryption>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'>
|
||||
<controller type='usb' index='0' model='piix3-uhci'>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
||||
</controller>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
@ -349,7 +349,7 @@ mymain(void)
|
||||
DO_TEST_NOCAPS("disk-network-tlsx509-nbd");
|
||||
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
|
||||
DO_TEST_NOCAPS("disk-network-tlsx509-vxhs");
|
||||
DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS);
|
||||
DO_TEST_CAPS_LATEST("disk-nvme");
|
||||
DO_TEST_CAPS_LATEST("disk-vhostuser");
|
||||
DO_TEST_CAPS_LATEST("disk-scsi");
|
||||
DO_TEST("disk-virtio-scsi-reservations",
|
||||
@ -570,8 +570,8 @@ mymain(void)
|
||||
DO_TEST_CAPS_LATEST("disk-slices");
|
||||
DO_TEST_CAPS_LATEST("disk-rotation");
|
||||
|
||||
DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
|
||||
DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
|
||||
DO_TEST_CAPS_LATEST("encrypted-disk");
|
||||
DO_TEST_CAPS_LATEST("encrypted-disk-usage");
|
||||
DO_TEST_CAPS_LATEST("luks-disks");
|
||||
DO_TEST_CAPS_LATEST("luks-disks-source");
|
||||
DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
|
||||
@ -1297,14 +1297,7 @@ mymain(void)
|
||||
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,
|
||||
QEMU_CAPS_QCOW2_LUKS,
|
||||
QEMU_CAPS_OBJECT_MEMORY_FILE,
|
||||
QEMU_CAPS_PIIX_DISABLE_S3,
|
||||
QEMU_CAPS_PIIX_DISABLE_S4,
|
||||
QEMU_CAPS_VNC,
|
||||
QEMU_CAPS_CCID_EMULATED);
|
||||
DO_TEST_CAPS_LATEST("user-aliases");
|
||||
DO_TEST("input-virtio-ccw",
|
||||
QEMU_CAPS_CCW,
|
||||
QEMU_CAPS_VIRTIO_KEYBOARD,
|
||||
|
Loading…
x
Reference in New Issue
Block a user