[libvirt] [PATCH v2 6/6] tests: qemuxml2xml: Convert aarch64-os-firmware-efi to TEST_CAPS
Demostrate DO_TEST_CAPS_ARCH_LATEST by converting the test case
'aarch64-os-firmware-efi'
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
...aarch64-os-firmware-efi.aarch64-latest.xml | 31 +++++++++++++++++++
.../aarch64-os-firmware-efi.xml | 1 -
tests/qemuxml2xmltest.c | 3 +-
3 files changed, 32 insertions(+), 3 deletions(-)
create mode 100644 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
delete mode 120000 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
new file mode 100644
index 0000000000..529ce6f3c2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
@@ -0,0 +1,31 @@
+<domain type='qemu'>
+ <name>aarch64test</name>
+ <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+ <memory unit='KiB'>1048576</memory>
+ <currentMemory unit='KiB'>1048576</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os firmware='efi'>
+ <type arch='aarch64' machine='virt-4.0'>hvm</type>
+ <kernel>/aarch64.kernel</kernel>
+ <initrd>/aarch64.initrd</initrd>
+ <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda
rootwait</cmdline>
+ <dtb>/aarch64.dtb</dtb>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <apic/>
+ <pae/>
+ <gic version='2'/>
+ </features>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='allow'>cortex-a53</model>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>restart</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-aarch64</emulator>
+ <controller type='pci' index='0' model='pcie-root'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml
b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml
deleted file mode 120000
index beea6b2955..0000000000
--- a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/aarch64-os-firmware-efi.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 812f5c7ea0..8e85710d45 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1010,8 +1010,7 @@ mymain(void)
DO_TEST("aarch64-aavmf-virtio-mmio",
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
- DO_TEST("aarch64-os-firmware-efi",
- QEMU_CAPS_DEVICE_VIRTIO_MMIO);
+ DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64");
DO_TEST("aarch64-virtio-pci-default",
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
--
2.21.0