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>
---
 .../qemufirmwaredata/usr/share/qemu/firmware/90-combined.json | 4 ++--
 tests/qemufirmwaretest.c                                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/90-combined.json
index 2c8381adf7..8ecac440b4 100644
--- 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 f16ea526ff..a4fb5c9b9c 100644
--- 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,
-- 
2.51.0

On 8/25/25 10:19, Andrea Bolognani via Devel wrote:
> 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>
> ---
>   .../qemufirmwaredata/usr/share/qemu/firmware/90-combined.json | 4 ++--
>   tests/qemufirmwaretest.c                                      | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)

ACK from V1 stands

https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/EZX2PDI2E2O2CMMFS6IAY2HUYNTMOP65/

Reviewed-by: Jim Fehlig <jfehlig@suse.com>

Regards,
Jim