Group all tests related to firmware selection together and give
them consistent names that leave room for further tests to be
added in an upcoming commit.
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
tests/qemusecuritytest.c | 6 +--
... => firmware-auto-bios.x86_64-latest.args} | 0
...rmware-bios.xml => firmware-auto-bios.xml} | 0
...ware-auto-efi-aarch64.aarch64-latest.args} | 0
...-efi.xml => firmware-auto-efi-aarch64.xml} | 0
...auto-efi-loader-secure.x86_64-latest.args} | 0
...ml => firmware-auto-efi-loader-secure.xml} | 0
...o-efi-no-enrolled-keys.x86_64-latest.args} | 0
...=> firmware-auto-efi-no-enrolled-keys.xml} | 0
...s => firmware-auto-efi.x86_64-latest.args} | 0
...firmware-efi.xml => firmware-auto-efi.xml} | 0
...anual-bios-rw-implicit.x86_64-latest.args} | 0
...l => firmware-manual-bios-rw-implicit.xml} | 0
...irmware-manual-bios-rw.x86_64-latest.args} | 0
...ram-rw.xml => firmware-manual-bios-rw.xml} | 0
.../{bios.args => firmware-manual-bios.args} | 0
.../{bios.xml => firmware-manual-bios.xml} | 0
... => firmware-manual-efi-acpi-aarch64.args} | 0
...l => firmware-manual-efi-acpi-aarch64.xml} | 0
...args => firmware-manual-efi-acpi-q35.args} | 0
...i.xml => firmware-manual-efi-acpi-q35.xml} | 0
...th.err => firmware-manual-efi-no-path.err} | 0
...th.xml => firmware-manual-efi-no-path.xml} | 0
...> firmware-manual-efi-noacpi-aarch64.args} | 0
...=> firmware-manual-efi-noacpi-aarch64.xml} | 0
...err => firmware-manual-efi-noacpi-q35.err} | 0
...xml => firmware-manual-efi-noacpi-q35.xml} | 0
...-manual-efi-nvram-file.x86_64-latest.args} | 0
...xml => firmware-manual-efi-nvram-file.xml} | 0
...-efi-nvram-network-iscsi.x86_64-4.1.0.err} | 0
...fi-nvram-network-iscsi.x86_64-latest.args} | 0
...rmware-manual-efi-nvram-network-iscsi.xml} | 0
...-efi-nvram-network-nbd.x86_64-latest.args} | 0
...firmware-manual-efi-nvram-network-nbd.xml} | 0
...ual-efi-nvram-template.x86_64-latest.args} | 0
...=> firmware-manual-efi-nvram-template.xml} | 0
...e.args => firmware-manual-efi-secure.args} | 0
...ure.xml => firmware-manual-efi-secure.xml} | 0
...os-nvram.args => firmware-manual-efi.args} | 0
...bios-nvram.xml => firmware-manual-efi.xml} | 0
...=> firmware-manual-noefi-acpi-aarch64.err} | 0
...=> firmware-manual-noefi-acpi-aarch64.xml} | 0
...gs => firmware-manual-noefi-acpi-q35.args} | 0
...xml => firmware-manual-noefi-acpi-q35.xml} | 0
...firmware-manual-noefi-noacpi-aarch64.args} | 0
... firmware-manual-noefi-noacpi-aarch64.xml} | 0
... => firmware-manual-noefi-noacpi-q35.args} | 0
...l => firmware-manual-noefi-noacpi-q35.xml} | 0
tests/qemuxml2argvtest.c | 52 +++++++++----------
...l => firmware-auto-bios.x86_64-latest.xml} | 0
...mware-auto-efi-aarch64.aarch64-latest.xml} | 0
...-auto-efi-loader-secure.x86_64-latest.xml} | 0
...uto-efi-no-enrolled-keys.x86_64-latest.xml | 1 +
...ml => firmware-auto-efi.x86_64-latest.xml} | 0
...e-manual-efi-nvram-file.x86_64-latest.xml} | 0
...efi-nvram-network-iscsi.x86_64-latest.xml} | 0
...l-efi-nvram-network-nbd.x86_64-latest.xml} | 0
...bios-nvram.xml => firmware-manual-efi.xml} | 0
...are-efi-no-enrolled-keys.x86_64-latest.xml | 1 -
tests/qemuxml2xmltest.c | 20 +++----
60 files changed, 39 insertions(+), 41 deletions(-)
rename tests/qemuxml2argvdata/{os-firmware-bios.x86_64-latest.args => firmware-auto-bios.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{os-firmware-bios.xml => firmware-auto-bios.xml} (100%)
rename tests/qemuxml2argvdata/{aarch64-os-firmware-efi.aarch64-latest.args => firmware-auto-efi-aarch64.aarch64-latest.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-os-firmware-efi.xml => firmware-auto-efi-aarch64.xml} (100%)
rename tests/qemuxml2argvdata/{os-firmware-efi-secboot.x86_64-latest.args => firmware-auto-efi-loader-secure.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{os-firmware-efi-secboot.xml => firmware-auto-efi-loader-secure.xml} (100%)
rename tests/qemuxml2argvdata/{os-firmware-efi-no-enrolled-keys.x86_64-latest.args => firmware-auto-efi-no-enrolled-keys.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{os-firmware-efi-no-enrolled-keys.xml => firmware-auto-efi-no-enrolled-keys.xml} (100%)
rename tests/qemuxml2argvdata/{os-firmware-efi.x86_64-latest.args => firmware-auto-efi.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{os-firmware-efi.xml => firmware-auto-efi.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-rw-implicit.x86_64-latest.args => firmware-manual-bios-rw-implicit.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-rw-implicit.xml => firmware-manual-bios-rw-implicit.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-rw.x86_64-latest.args => firmware-manual-bios-rw.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-rw.xml => firmware-manual-bios-rw.xml} (100%)
rename tests/qemuxml2argvdata/{bios.args => firmware-manual-bios.args} (100%)
rename tests/qemuxml2argvdata/{bios.xml => firmware-manual-bios.xml} (100%)
rename tests/qemuxml2argvdata/{aarch64-acpi-uefi.args => firmware-manual-efi-acpi-aarch64.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-acpi-uefi.xml => firmware-manual-efi-acpi-aarch64.xml} (100%)
rename tests/qemuxml2argvdata/{q35-acpi-uefi.args => firmware-manual-efi-acpi-q35.args} (100%)
rename tests/qemuxml2argvdata/{q35-acpi-uefi.xml => firmware-manual-efi-acpi-q35.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-no-path.err => firmware-manual-efi-no-path.err} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-no-path.xml => firmware-manual-efi-no-path.xml} (100%)
rename tests/qemuxml2argvdata/{aarch64-noacpi-uefi.args => firmware-manual-efi-noacpi-aarch64.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-noacpi-uefi.xml => firmware-manual-efi-noacpi-aarch64.xml} (100%)
rename tests/qemuxml2argvdata/{q35-noacpi-uefi.err => firmware-manual-efi-noacpi-q35.err} (100%)
rename tests/qemuxml2argvdata/{q35-noacpi-uefi.xml => firmware-manual-efi-noacpi-q35.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-file.x86_64-latest.args => firmware-manual-efi-nvram-file.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-file.xml => firmware-manual-efi-nvram-file.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-network-iscsi.x86_64-4.1.0.err => firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-network-iscsi.x86_64-latest.args => firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-network-iscsi.xml => firmware-manual-efi-nvram-network-iscsi.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-network-nbd.x86_64-latest.args => firmware-manual-efi-nvram-network-nbd.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-network-nbd.xml => firmware-manual-efi-nvram-network-nbd.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-template.x86_64-latest.args => firmware-manual-efi-nvram-template.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-template.xml => firmware-manual-efi-nvram-template.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-secure.args => firmware-manual-efi-secure.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram-secure.xml => firmware-manual-efi-secure.xml} (100%)
rename tests/qemuxml2argvdata/{bios-nvram.args => firmware-manual-efi.args} (100%)
rename tests/qemuxml2argvdata/{bios-nvram.xml => firmware-manual-efi.xml} (100%)
rename tests/qemuxml2argvdata/{aarch64-acpi-nouefi.err => firmware-manual-noefi-acpi-aarch64.err} (100%)
rename tests/qemuxml2argvdata/{aarch64-acpi-nouefi.xml => firmware-manual-noefi-acpi-aarch64.xml} (100%)
rename tests/qemuxml2argvdata/{q35-acpi-nouefi.args => firmware-manual-noefi-acpi-q35.args} (100%)
rename tests/qemuxml2argvdata/{q35-acpi-nouefi.xml => firmware-manual-noefi-acpi-q35.xml} (100%)
rename tests/qemuxml2argvdata/{aarch64-noacpi-nouefi.args => firmware-manual-noefi-noacpi-aarch64.args} (100%)
rename tests/qemuxml2argvdata/{aarch64-noacpi-nouefi.xml => firmware-manual-noefi-noacpi-aarch64.xml} (100%)
rename tests/qemuxml2argvdata/{q35-noacpi-nouefi.args => firmware-manual-noefi-noacpi-q35.args} (100%)
rename tests/qemuxml2argvdata/{q35-noacpi-nouefi.xml => firmware-manual-noefi-noacpi-q35.xml} (100%)
rename tests/qemuxml2xmloutdata/{os-firmware-bios.x86_64-latest.xml => firmware-auto-bios.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{aarch64-os-firmware-efi.aarch64-latest.xml => firmware-auto-efi-aarch64.aarch64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{os-firmware-efi-secboot.x86_64-latest.xml => firmware-auto-efi-loader-secure.x86_64-latest.xml} (100%)
create mode 120000 tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
rename tests/qemuxml2xmloutdata/{os-firmware-efi.x86_64-latest.xml => firmware-auto-efi.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{bios-nvram-file.x86_64-latest.xml => firmware-manual-efi-nvram-file.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{bios-nvram-network-iscsi.x86_64-latest.xml => firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{bios-nvram-network-nbd.x86_64-latest.xml => firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml} (100%)
rename tests/qemuxml2xmloutdata/{bios-nvram.xml => firmware-manual-efi.xml} (100%)
delete mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.xml
diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c
index 4e2343b7d7..0596783b6c 100644
--- a/tests/qemusecuritytest.c
+++ b/tests/qemusecuritytest.c
@@ -237,9 +237,9 @@ mymain(void)
DO_TEST_DOMAIN("memory-hotplug-nvdimm-pmem");
DO_TEST_DOMAIN("memory-hotplug-nvdimm-readonly");
DO_TEST_DOMAIN("net-vhostuser");
- DO_TEST_DOMAIN("os-firmware-bios");
- DO_TEST_DOMAIN("os-firmware-efi");
- DO_TEST_DOMAIN("os-firmware-efi-secboot");
+ DO_TEST_DOMAIN("firmware-auto-bios");
+ DO_TEST_DOMAIN("firmware-auto-efi");
+ DO_TEST_DOMAIN("firmware-auto-efi-loader-secure");
DO_TEST_DOMAIN("pci-bridge-many-disks");
DO_TEST_DOMAIN("tseg-explicit-size");
DO_TEST_DOMAIN("usb-redir-unix");
diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/os-firmware-bios.xml b/tests/qemuxml2argvdata/firmware-auto-bios.xml
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-bios.xml
rename to tests/qemuxml2argvdata/firmware-auto-bios.xml
diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
rename to tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.xml b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-os-firmware-efi.xml
rename to tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml
diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.xml b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-efi-secboot.xml
rename to tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml
diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml
rename to tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml
diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/os-firmware-efi.xml b/tests/qemuxml2argvdata/firmware-auto-efi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/os-firmware-efi.xml
rename to tests/qemuxml2argvdata/firmware-auto-efi.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-rw-implicit.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-rw-implicit.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/bios-nvram-rw-implicit.xml b/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-rw-implicit.xml
rename to tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-rw.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/bios-nvram-rw.xml b/tests/qemuxml2argvdata/firmware-manual-bios-rw.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-rw.xml
rename to tests/qemuxml2argvdata/firmware-manual-bios-rw.xml
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/firmware-manual-bios.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios.args
rename to tests/qemuxml2argvdata/firmware-manual-bios.args
diff --git a/tests/qemuxml2argvdata/bios.xml b/tests/qemuxml2argvdata/firmware-manual-bios.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios.xml
rename to tests/qemuxml2argvdata/firmware-manual-bios.xml
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-acpi-uefi.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.xml b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-acpi-uefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml
diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35-acpi-uefi.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.xml b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/q35-acpi-uefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-no-path.err b/tests/qemuxml2argvdata/firmware-manual-efi-no-path.err
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-no-path.err
rename to tests/qemuxml2argvdata/firmware-manual-efi-no-path.err
diff --git a/tests/qemuxml2argvdata/bios-nvram-no-path.xml b/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-no-path.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-noacpi-uefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml
diff --git a/tests/qemuxml2argvdata/q35-noacpi-uefi.err b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err
similarity index 100%
rename from tests/qemuxml2argvdata/q35-noacpi-uefi.err
rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.err
diff --git a/tests/qemuxml2argvdata/q35-noacpi-uefi.xml b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/q35-noacpi-uefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-file.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-file.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/bios-nvram-file.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-file.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-4.1.0.err b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-4.1.0.err
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
diff --git a/tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/bios-nvram-network-iscsi.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-network-iscsi.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-network-nbd.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/bios-nvram-network-nbd.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-network-nbd.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/bios-nvram-template.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-template.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-secure.args
rename to tests/qemuxml2argvdata/firmware-manual-efi-secure.args
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.xml b/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram-secure.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-secure.xml
diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/firmware-manual-efi.args
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram.args
rename to tests/qemuxml2argvdata/firmware-manual-efi.args
diff --git a/tests/qemuxml2argvdata/bios-nvram.xml b/tests/qemuxml2argvdata/firmware-manual-efi.xml
similarity index 100%
rename from tests/qemuxml2argvdata/bios-nvram.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi.xml
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.err b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-acpi-nouefi.err
rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.err
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.xml b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-acpi-nouefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml
diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35-acpi-nouefi.args
rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.xml b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/q35-acpi-nouefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.xml b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-noacpi-nouefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml
diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
similarity index 100%
rename from tests/qemuxml2argvdata/q35-noacpi-nouefi.args
rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.xml b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml
similarity index 100%
rename from tests/qemuxml2argvdata/q35-noacpi-nouefi.xml
rename to tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 48dd20458e..9aa22d5c06 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1188,29 +1188,39 @@ mymain(void)
DO_TEST_NOCAPS("reboot-timeout-disabled");
DO_TEST_NOCAPS("reboot-timeout-enabled");
- DO_TEST("bios",
+ DO_TEST("firmware-manual-bios",
QEMU_CAPS_DEVICE_ISA_SERIAL);
- DO_TEST_NOCAPS("bios-nvram");
- DO_TEST_PARSE_ERROR_NOCAPS("bios-nvram-no-path");
- DO_TEST_CAPS_LATEST("bios-nvram-rw");
- DO_TEST_CAPS_LATEST("bios-nvram-rw-implicit");
- DO_TEST("bios-nvram-secure",
+ DO_TEST_NOCAPS("firmware-manual-efi");
+ DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path");
+ DO_TEST_CAPS_LATEST("firmware-manual-bios-rw");
+ DO_TEST_CAPS_LATEST("firmware-manual-bios-rw-implicit");
+ DO_TEST("firmware-manual-efi-secure",
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_IOH3420,
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST_CAPS_LATEST("bios-nvram-template");
- DO_TEST_CAPS_LATEST("bios-nvram-network-iscsi");
- DO_TEST_CAPS_VER_PARSE_ERROR("bios-nvram-network-iscsi", "4.1.0");
- DO_TEST_CAPS_LATEST("bios-nvram-network-nbd");
- DO_TEST_CAPS_LATEST("bios-nvram-file");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
+ DO_TEST_CAPS_VER_PARSE_ERROR("firmware-manual-efi-nvram-network-iscsi", "4.1.0");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file");
/* Make sure all combinations of ACPI and UEFI behave as expected */
- DO_TEST_NOCAPS("q35-acpi-uefi");
- DO_TEST_PARSE_ERROR_NOCAPS("q35-noacpi-uefi");
- DO_TEST_NOCAPS("q35-noacpi-nouefi");
- DO_TEST_NOCAPS("q35-acpi-nouefi");
+ DO_TEST_NOCAPS("firmware-manual-efi-acpi-aarch64");
+ DO_TEST_NOCAPS("firmware-manual-efi-acpi-q35");
+ DO_TEST_NOCAPS("firmware-manual-efi-noacpi-aarch64");
+ DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-noacpi-q35");
+ DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-noefi-acpi-aarch64");
+ DO_TEST_NOCAPS("firmware-manual-noefi-acpi-q35");
+ DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-aarch64");
+ DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-q35");
+
+ DO_TEST_CAPS_LATEST("firmware-auto-bios");
+ DO_TEST_CAPS_LATEST("firmware-auto-efi");
+ DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure");
+ DO_TEST_CAPS_LATEST("firmware-auto-efi-no-enrolled-keys");
+ DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64");
DO_TEST_NOCAPS("clock-utc");
DO_TEST_NOCAPS("clock-localtime");
@@ -3018,12 +3028,6 @@ mymain(void)
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_SERIAL);
- /* Make sure all combinations of ACPI and UEFI behave as expected */
- DO_TEST_NOCAPS("aarch64-acpi-uefi");
- DO_TEST_NOCAPS("aarch64-noacpi-uefi");
- DO_TEST_NOCAPS("aarch64-noacpi-nouefi");
- DO_TEST_PARSE_ERROR_NOCAPS("aarch64-acpi-nouefi");
-
/* QEMU 4.0.0 didn't have support for aarch64 CPU features */
DO_TEST_CAPS_ARCH_VER_FAILURE("aarch64-features-sve", "aarch64", "4.0.0");
/* aarch64 doesn't support the same CPU features as x86 */
@@ -3408,12 +3412,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-graphics", "x86_64");
DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-graphics", "x86_64");
- DO_TEST_CAPS_LATEST("os-firmware-bios");
- DO_TEST_CAPS_LATEST("os-firmware-efi");
- DO_TEST_CAPS_LATEST("os-firmware-efi-secboot");
- DO_TEST_CAPS_LATEST("os-firmware-efi-no-enrolled-keys");
- DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64");
-
DO_TEST_CAPS_LATEST("vhost-user-vga");
DO_TEST_CAPS_LATEST("vhost-user-gpu-secondary");
diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
rename to tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
new file mode 120000
index 0000000000..f954b0c4e1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/bios-nvram-file.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/bios-nvram-file.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/bios-nvram-network-iscsi.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/bios-nvram-network-iscsi.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/bios-nvram-network-nbd.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/bios-nvram-network-nbd.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml b/tests/qemuxml2xmloutdata/firmware-manual-efi.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/bios-nvram.xml
rename to tests/qemuxml2xmloutdata/firmware-manual-efi.xml
diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.xml
deleted file mode 120000
index 902ccb783b..0000000000
--- a/tests/qemuxml2xmloutdata/os-firmware-efi-no-enrolled-keys.x86_64-latest.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 714d36c0a0..fdcb17838b 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1067,10 +1067,16 @@ mymain(void)
DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT, QEMU_CAPS_OBJECT_MEMORY_RAM);
DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode");
- DO_TEST_NOCAPS("bios-nvram");
- DO_TEST_CAPS_LATEST("bios-nvram-network-iscsi");
- DO_TEST_CAPS_LATEST("bios-nvram-network-nbd");
- DO_TEST_CAPS_LATEST("bios-nvram-file");
+ DO_TEST_NOCAPS("firmware-manual-efi");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file");
+
+ DO_TEST_CAPS_LATEST("firmware-auto-bios");
+ DO_TEST_CAPS_LATEST("firmware-auto-efi");
+ DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure");
+ DO_TEST_CAPS_LATEST("firmware-auto-efi-no-enrolled-keys");
+ DO_TEST_CAPS_ARCH_LATEST("firmware-auto-efi-aarch64", "aarch64");
DO_TEST_NOCAPS("tap-vhost");
DO_TEST_NOCAPS("tap-vhost-incorrect");
@@ -1081,15 +1087,9 @@ mymain(void)
DO_TEST_NOCAPS("smbios-multiple-type2");
DO_TEST_NOCAPS("smbios-type-fwcfg");
- DO_TEST_CAPS_LATEST("os-firmware-bios");
- DO_TEST_CAPS_LATEST("os-firmware-efi");
- DO_TEST_CAPS_LATEST("os-firmware-efi-secboot");
- DO_TEST_CAPS_LATEST("os-firmware-efi-no-enrolled-keys");
-
DO_TEST("aarch64-aavmf-virtio-mmio",
QEMU_CAPS_DEVICE_VIRTIO_MMIO,
QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);
- 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.35.3
