tests: Tweak descriptor for combined firmware

This kind of firmware build is not shipped in Fedora, where
most descriptors in our test suite come from, so we had to
make it up. It was based off the Secure Boot-enabled edk2
build, and the filename it points to is the same.

That has been fine so far since it's not actually being picked
up by any of the test cases, but that's going to change soon
and when it does we want to be able to avoid any confusion.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>

diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json
index 2c8381adf7f14f74389cc8358f6699a9a41fb80e..8ecac440b4612e14897a52d385aedefc7b3a221f 100644 (file)
--- a/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json
+++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json
@@ -1,5 +1,5 @@
 {
-    "description": "OVMF with SB+SMM, SB enabled, MS certs enrolled",
+    "description": "OVMF with SB+SMM, SB enabled, MS certs enrolled (combined)",
     "interface-types": [
         "uefi"
     ],
@@ -7,7 +7,7 @@
         "device": "flash",
         "mode": "combined",
         "executable": {
-            "filename": "/usr/share/edk2/ovmf/OVMF.secboot.fd",
+            "filename": "/usr/share/edk2/ovmf/OVMF.combined.fd",
             "format": "raw"
         }
     },

diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c
index f16ea526ffbe1ac825eb5e318b01f4ae3ee43010..a4fb5c9b9c7d899f5f2c12ff72cbbc67d6f33664 100644 (file)
--- a/tests/qemufirmwaretest.c
+++ b/tests/qemufirmwaretest.c
@@ -317,7 +317,7 @@ mymain(void)
                       "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd:"
                       "/usr/share/edk2/ovmf/OVMF_CODE_4M.qcow2:/usr/share/edk2/ovmf/OVMF_VARS_4M.qcow2:"
                       "/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd:"
-                      "/usr/share/edk2/ovmf/OVMF.secboot.fd:NULL:"
+                      "/usr/share/edk2/ovmf/OVMF.combined.fd:NULL:"
                       "/usr/share/edk2/ovmf/OVMF.amdsev.fd:NULL:"
                       "/usr/share/edk2/ovmf/OVMF.inteltdx.secboot.fd:NULL",
                       VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS,