...mware-manual-efi-secure.x86_64-latest.xml} | 14 +- ...re-manual-efi-stateless.x86_64-latest.xml} | 11 +- ... => firmware-manual-efi.x86_64-latest.xml} | 11 +- ...e-manual-noefi-acpi-q35.x86_64-latest.xml} | 10 +- ...l-noefi-noacpi-aarch64.aarch64-latest.xml} | 7 +- ...manual-noefi-noacpi-q35.x86_64-latest.xml} | 13 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 4 +- tests/qemuxml2xmltest.c | 32 +- 160 files changed, 1408 insertions(+), 990 deletions(-) create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/65-ovmf-qcow2.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/66-aavmf-qcow2.json copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-auto-efi-format-loader-qcow2.x86_64-latest.args} (61%) copy tests/qemuxml2argvdata/{firmware-auto-efi-stateless.xml => firmware-auto-efi-format-loader-qcow2.xml} (81%) copy tests/qemuxml2argvdata/{virtio-iommu-aarch64.aarch64-latest.args => firmware-auto-efi-format-loader-raw.aarch64-latest.args} (89%) copy tests/qemuxml2argvdata/{firmware-auto-efi-aarch64.xml => firmware-auto-efi-format-loader-raw.xml} (79%) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.x86_64-latest.err copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-format-mismatch.xml} (75%) copy tests/qemuxml2argvdata/{firmware-manual-efi-nvram-network-nbd.x86_64-latest.args => firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args} (61%) copy tests/qemuxml2argvdata/{firmware-manual-efi-nvram-network-nbd.xml => firmware-auto-efi-format-nvram-qcow2-network-nbd.xml} (63%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args} (58%) copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-format-nvram-qcow2-path.xml} (76%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args} (61%) copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-secure.xml => firmware-auto-efi-format-nvram-qcow2.xml} (81%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.args => firmware-auto-efi-nvram-file.x86_64-latest.args} (63%) copy tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-q35.xml => firmware-auto-efi-nvram-file.xml} (60%) copy tests/qemuxml2argvdata/{firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args => firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args} (77%) copy tests/qemuxml2argvdata/{firmware-manual-efi-nvram-network-iscsi.xml => firmware-auto-efi-nvram-network-iscsi.xml} (73%) copy tests/qemuxml2argvdata/{firmware-manual-efi-nvram-network-nbd.x86_64-latest.args => firmware-auto-efi-nvram-network-nbd.x86_64-latest.args} (72%) copy tests/qemuxml2argvdata/{firmware-manual-efi-nvram-network-nbd.xml => firmware-auto-efi-nvram-network-nbd.xml} (67%) copy tests/qemuxml2argvdata/{virtio-iommu-aarch64.aarch64-latest.args => firmware-auto-efi-smm-off.x86_64-latest.args} (67%) copy tests/qemuxml2argvdata/{firmware-auto-efi.xml => firmware-auto-efi-smm-off.xml} (82%) rename tests/qemuxml2argvdata/{firmware-manual-bios-not-stateless.err => firmware-manual-bios-not-stateless.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.args copy tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-q35.args => firmware-manual-bios-stateless.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/firmware-manual-bios.args copy tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-q35.args => firmware-manual-bios.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-aarch64.args => firmware-manual-efi-acpi-aarch64.aarch64-latest.args} (62%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.args => firmware-manual-efi-acpi-q35.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.err => firmware-manual-efi-no-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-aarch64.args => firmware-manual-efi-noacpi-aarch64.aarch64-latest.args} (62%) rename tests/qemuxml2argvdata/{firmware-manual-efi-noacpi-q35.err => firmware-manual-efi-noacpi-q35.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw.x86_64-latest.args => firmware-manual-efi-rw-implicit.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw-implicit.xml => firmware-manual-efi-rw-implicit.xml} (60%) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw-implicit.x86_64-latest.args => firmware-manual-efi-rw.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{firmware-manual-bios-rw.xml => firmware-manual-efi-rw.xml} (59%) delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-secure.args copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.x86_64-latest.args => firmware-manual-efi-secure.x86_64-latest.args} (70%) delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi.args rename tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.args => firmware-manual-efi.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-aarch64.err => firmware-manual-noefi-acpi-aarch64.aarch64-latest.err} (100%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-acpi-q35.args => firmware-manual-noefi-acpi-q35.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-aarch64.args => firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args} (60%) rename tests/qemuxml2argvdata/{firmware-manual-noefi-noacpi-q35.args => firmware-manual-noefi-noacpi-q35.x86_64-latest.args} (64%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-secure.x86_64-latest.xml => firmware-auto-efi-format-loader-qcow2.x86_64-latest.xml} (74%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-auto-efi-format-loader-raw.aarch64-latest.xml} (74%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml => firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.xml} (76%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-secure.x86_64-latest.xml => firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.xml} (75%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-secure.x86_64-latest.xml => firmware-auto-efi-format-nvram-qcow2.x86_64-latest.xml} (74%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-file.x86_64-latest.xml => firmware-auto-efi-nvram-file.x86_64-latest.xml} (78%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml => firmware-auto-efi-nvram-network-iscsi.x86_64-latest.xml} (89%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml => firmware-auto-efi-nvram-network-nbd.x86_64-latest.xml} (88%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-secure.x86_64-latest.xml => firmware-auto-efi-smm-off.x86_64-latest.xml} (75%) copy tests/qemuxml2xmloutdata/{firmware-auto-bios-stateless.x86_64-latest.xml => firmware-auto-efi-stateless.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios-stateless.xml => firmware-manual-bios-stateless.x86_64-latest.xml} (69%) rename tests/qemuxml2xmloutdata/{firmware-manual-bios.xml => firmware-manual-bios.x86_64-latest.xml} (69%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-manual-efi-acpi-aarch64.aarch64-latest.xml} (76%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-secure.x86_64-latest.xml => firmware-manual-efi-acpi-q35.x86_64-latest.xml} (76%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-manual-efi-noacpi-aarch64.aarch64-latest.xml} (76%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-file.x86_64-latest.xml => firmware-manual-efi-nvram-template.x86_64-latest.xml} (78%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-file.x86_64-latest.xml => firmware-manual-efi-rw-implicit.x86_64-latest.xml} (72%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-file.x86_64-latest.xml => firmware-manual-efi-rw.x86_64-latest.xml} (72%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-secure.x86_64-latest.xml => firmware-manual-efi-secure.x86_64-latest.xml} (73%) copy tests/qemuxml2xmloutdata/{firmware-manual-efi-nvram-file.x86_64-latest.xml => firmware-manual-efi-stateless.x86_64-latest.xml} (72%) rename tests/qemuxml2xmloutdata/{firmware-manual-efi.xml => firmware-manual-efi.x86_64-latest.xml} (70%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi.x86_64-latest.xml => firmware-manual-noefi-acpi-q35.x86_64-latest.xml} (86%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-manual-noefi-noacpi-aarch64.aarch64-latest.xml} (88%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi.x86_64-latest.xml => firmware-manual-noefi-noacpi-q35.x86_64-latest.xml} (83%)