On Wed, Feb 18, 2026 at 01:05:28PM +0100, Andrea Bolognani via Devel wrote:
> This is one of our custom descriptors. The firmware binary it
> advertises really exists, but looking at the qemuxmlconf test
> cases we use a slightly different path there.
AFAICT, qemuxmlconf test cases use a mixture of bios.bin and
bios-256k.bin. So effectively this change is just standardizing
everything on a single path.
FWIW, bios.bin is the older 128k binary only used by old QEMU
machine types, while bios-256k.bin is the current default
in QEMU.
So if anything I'd have this change in the opposite direction,
make everyting use bios-256k.bni
> As a consequence of this change, the firmware-manual-bios* test
> cases behave more realistically, in that the JSON firmware
> descriptor is picked up and the additional information that can
> be figured out from it is filled in.
>
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
> .../usr/share/qemu/firmware/91-libvirt-bios.json | 2 +-
> tests/qemufirmwaretest.c | 8 ++++----
> .../firmware-auto-bios-stateless.x86_64-latest.args | 2 +-
> .../firmware-auto-bios-stateless.x86_64-latest.xml | 2 +-
> .../qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args | 2 +-
> .../qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml | 2 +-
> .../firmware-manual-bios-stateless.x86_64-latest.xml | 6 +++++-
> .../firmware-manual-bios.x86_64-latest.xml | 6 +++++-
> 8 files changed, 19 insertions(+), 11 deletions(-)
>
> diff --git a/tests/qemufirmwaredata/usr/share/qemu/firmware/91-libvirt-bios.json b/tests/qemufirmwaredata/usr/share/qemu/firmware/91-libvirt-bios.json
> index 378e6d93a5..de09927437 100644
> --- a/tests/qemufirmwaredata/usr/share/qemu/firmware/91-libvirt-bios.json
> +++ b/tests/qemufirmwaredata/usr/share/qemu/firmware/91-libvirt-bios.json
> @@ -5,7 +5,7 @@
> ],
> "mapping": {
> "device": "memory",
> - "filename": "/usr/share/seabios/bios-256k.bin"
> + "filename": "/usr/share/seabios/bios.bin"
> },
> "targets": [
> {
> diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c
> index e09f50592b..922d32b74d 100644
> --- a/tests/qemufirmwaretest.c
> +++ b/tests/qemufirmwaretest.c
> @@ -306,16 +306,16 @@ mymain(void)
> } while (0)
>
> DO_SUPPORTED_TEST("pc-i440fx-3.1", VIR_ARCH_X86_64, false,
> - "/usr/share/seabios/bios-256k.bin:NULL:"
> + "/usr/share/seabios/bios.bin:NULL:"
> "/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",
> VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS,
> VIR_DOMAIN_OS_DEF_FIRMWARE_EFI);
> DO_SUPPORTED_TEST("pc-i440fx-3.1", VIR_ARCH_I686, false,
> - "/usr/share/seabios/bios-256k.bin:NULL",
> + "/usr/share/seabios/bios.bin:NULL",
> VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS);
> DO_SUPPORTED_TEST("pc-q35-3.1", VIR_ARCH_X86_64, true,
> - "/usr/share/seabios/bios-256k.bin:NULL:"
> + "/usr/share/seabios/bios.bin:NULL:"
> "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2:/usr/share/edk2/ovmf/OVMF_VARS_4M.secboot.qcow2:"
> "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd:"
> "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2:/usr/share/edk2/ovmf/OVMF_VARS_4M.qcow2:"
> @@ -328,7 +328,7 @@ mymain(void)
> VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS,
> VIR_DOMAIN_OS_DEF_FIRMWARE_EFI);
> DO_SUPPORTED_TEST("pc-q35-3.1", VIR_ARCH_I686, false,
> - "/usr/share/seabios/bios-256k.bin:NULL",
> + "/usr/share/seabios/bios.bin:NULL",
> VIR_DOMAIN_OS_DEF_FIRMWARE_BIOS);
> DO_SUPPORTED_TEST("microvm", VIR_ARCH_X86_64, false,
> "/usr/share/edk2/ovmf/MICROVM.fd:NULL",
> diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
> index a6a52e2b52..a96a0e1bbf 100644
> --- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
> +++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
> @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
> -machine pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
> -accel kvm \
> -cpu qemu64 \
> --bios /usr/share/seabios/bios-256k.bin \
> +-bios /usr/share/seabios/bios.bin \
> -m size=1048576k \
> -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
> -overcommit mem-lock=off \
> diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
> index 547dff5ed3..de0d3c7560 100644
> --- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
> +++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.xml
> @@ -10,7 +10,7 @@
> <feature enabled='no' name='enrolled-keys'/>
> <feature enabled='no' name='secure-boot'/>
> </firmware>
> - <loader type='rom' stateless='yes' format='raw'>/usr/share/seabios/bios-256k.bin</loader>
> + <loader type='rom' stateless='yes' format='raw'>/usr/share/seabios/bios.bin</loader>
> <boot dev='hd'/>
> </os>
> <features>
> diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
> index a6a52e2b52..a96a0e1bbf 100644
> --- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
> +++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
> @@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
> -machine pc-q35-10.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=on \
> -accel kvm \
> -cpu qemu64 \
> --bios /usr/share/seabios/bios-256k.bin \
> +-bios /usr/share/seabios/bios.bin \
> -m size=1048576k \
> -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
> -overcommit mem-lock=off \
> diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
> index ae9c9f56d9..ea0cf0134a 100644
> --- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
> +++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.xml
> @@ -10,7 +10,7 @@
> <feature enabled='no' name='enrolled-keys'/>
> <feature enabled='no' name='secure-boot'/>
> </firmware>
> - <loader type='rom' format='raw'>/usr/share/seabios/bios-256k.bin</loader>
> + <loader type='rom' format='raw'>/usr/share/seabios/bios.bin</loader>
> <boot dev='hd'/>
> </os>
> <features>
> diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml
> index dc641ff9f6..4aaa13e668 100644
> --- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml
> +++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.xml
> @@ -4,8 +4,12 @@
> <memory unit='KiB'>1048576</memory>
> <currentMemory unit='KiB'>1048576</currentMemory>
> <vcpu placement='static'>1</vcpu>
> - <os>
> + <os firmware='bios'>
> <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
> + <firmware>
> + <feature enabled='no' name='enrolled-keys'/>
> + <feature enabled='no' name='secure-boot'/>
> + </firmware>
> <loader type='rom' stateless='yes' format='raw'>/usr/share/seabios/bios.bin</loader>
> <boot dev='hd'/>
> </os>
> diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml
> index 7c06d8e8b8..85dec8ca8e 100644
> --- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml
> +++ b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.xml
> @@ -4,8 +4,12 @@
> <memory unit='KiB'>1048576</memory>
> <currentMemory unit='KiB'>1048576</currentMemory>
> <vcpu placement='static'>1</vcpu>
> - <os>
> + <os firmware='bios'>
> <type arch='x86_64' machine='pc-i440fx-10.0'>hvm</type>
> + <firmware>
> + <feature enabled='no' name='enrolled-keys'/>
> + <feature enabled='no' name='secure-boot'/>
> + </firmware>
> <loader type='rom' format='raw'>/usr/share/seabios/bios.bin</loader>
> <boot dev='hd'/>
> </os>
> --
> 2.53.0
>
With regards,
Daniel
--
|: https://berrange.com ~~ https://hachyderm.io/@berrange :|
|: https://libvirt.org ~~ https://entangle-photo.org :|
|: https://pixelfed.art/berrange ~~ https://fstop138.berrange.com :|