Changes from [v2]:
* more tweaks to firmware files, with a matching edk2 PR this
time around.
Changes from [v1]:
* pick up Jim's test suite improvements;
* squash in fixes for issues found during review;
* add a few commits intented to spark further discussion around
what the firmware descriptors should look like in the edk2
package.
[v2] https://lists.libvirt.org/archives/list/devel@xxxxxxxxxxxxxxxxx/thread/IBI4ZG6YDMW35WIEZVPHIQCVFZ5GMQZZ/
[v1] https://lists.libvirt.org/archives/list/devel@xxxxxxxxxxxxxxxxx/thread/RKQ3ANKDNJEFJSKQR4FMDU7PVHWYKYSF/
Andrea Bolognani (8):
tests: Tweak descriptor for combined firmware
tests: Minimize SEV tests
tests: Add tests for SEV firmware selection
qemu: Fix matching for stateless/combined firmware
qemu: Fix matching for read/write firmware
news: Update for firmware selection fixes
DONOTMERGE update firmware data
DONOTMERGE don't explicitly request stateless firmware for SEV
Jim Fehlig (1):
tests: Improve AMD SEV-related tests
NEWS.rst | 5 ++
src/qemu/qemu_firmware.c | 47 ++++++++++++++-----
.../firmware/60-edk2-ovmf-x64-amdsev.json | 8 +---
...30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json | 3 +-
.../31-edk2-ovmf-2m-raw-x64-sb-enrolled.json | 3 +-
.../40-edk2-ovmf-4m-qcow2-x64-sb.json | 3 +-
.../firmware/41-edk2-ovmf-2m-raw-x64-sb.json | 3 +-
.../qemu/firmware/50-edk2-aarch64-qcow2.json | 4 +-
.../qemu/firmware/50-edk2-loongarch64.json | 2 +
.../50-edk2-ovmf-4m-qcow2-x64-nosb.json | 5 +-
.../qemu/firmware/50-edk2-riscv-qcow2.json | 4 +-
.../qemu/firmware/51-edk2-aarch64-raw.json | 4 +-
.../51-edk2-ovmf-2m-raw-x64-nosb.json | 5 +-
.../52-edk2-aarch64-verbose-qcow2.json | 3 +-
.../firmware/53-edk2-aarch64-verbose-raw.json | 3 +-
.../firmware/60-edk2-ovmf-x64-amdsev.json | 11 ++---
.../firmware/60-edk2-ovmf-x64-inteltdx.json | 1 -
... => 61-edk2-ovmf-x64-amdsev-stateful.json} | 7 +--
.../usr/share/qemu/firmware/90-combined.json | 5 +-
tests/qemufirmwaretest.c | 4 +-
...are-auto-efi-rw-pflash.x86_64-latest.args} | 7 +--
...mware-auto-efi-rw-pflash.x86_64-latest.err | 1 -
...mware-auto-efi-rw-pflash.x86_64-latest.xml | 6 ++-
...> firmware-auto-efi-rw.x86_64-latest.args} | 7 +--
.../firmware-auto-efi-rw.x86_64-latest.err | 1 -
.../firmware-auto-efi-rw.x86_64-latest.xml | 6 ++-
...uto-efi-sev-snp.x86_64-latest+amdsev.args} | 6 +--
...auto-efi-sev-snp.x86_64-latest+amdsev.xml} | 5 +-
.../firmware-auto-efi-sev-snp.xml | 20 ++++++++
...fi-sev-stateful.x86_64-latest+amdsev.args} | 6 ++-
...efi-sev-stateful.x86_64-latest+amdsev.xml} | 6 ++-
.../firmware-auto-efi-sev-stateful.xml | 21 +++++++++
...re-auto-efi-sev.x86_64-latest+amdsev.args} | 6 +--
...are-auto-efi-sev.x86_64-latest+amdsev.xml} | 5 +-
.../qemuxmlconfdata/firmware-auto-efi-sev.xml | 20 ++++++++
...ware-auto-efi-stateless.x86_64-latest.args | 5 +-
...mware-auto-efi-stateless.x86_64-latest.xml | 2 +-
...urity-sev-direct.x86_64-latest+amdsev.args | 7 ++-
...curity-sev-direct.x86_64-latest+amdsev.xml | 19 +++-----
...nch-security-sev-direct.x86_64-latest.args | 7 ++-
...unch-security-sev-direct.x86_64-latest.xml | 19 +++-----
.../launch-security-sev-direct.xml | 19 +-------
...ng-platform-info.x86_64-latest+amdsev.args | 8 ++--
...ing-platform-info.x86_64-latest+amdsev.xml | 29 ++++++------
...nch-security-sev-missing-platform-info.xml | 25 +++-------
...security-sev-snp.x86_64-latest+amdsev.args | 11 +----
...-security-sev-snp.x86_64-latest+amdsev.xml | 29 +-----------
...launch-security-sev-snp.x86_64-latest.args | 11 +----
.../launch-security-sev-snp.x86_64-latest.xml | 29 +-----------
.../launch-security-sev-snp.xml | 45 +-----------------
...nch-security-sev.x86_64-latest+amdsev.args | 8 ++--
...unch-security-sev.x86_64-latest+amdsev.xml | 29 ++++++------
tests/qemuxmlconfdata/launch-security-sev.xml | 25 +++-------
tests/qemuxmlconftest.c | 18 ++++++-
54 files changed, 266 insertions(+), 332 deletions(-)
copy tests/qemufirmwaredata/usr/share/qemu/firmware/{51-edk2-ovmf-2m-raw-x64-nosb.json => 61-edk2-ovmf-x64-amdsev-stateful.json} (81%)
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-auto-efi-rw-pflash.x86_64-latest.args} (75%)
delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.err
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-auto-efi-rw.x86_64-latest.args} (75%)
delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.err
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-auto-efi-sev-snp.x86_64-latest+amdsev.args} (78%)
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-auto-efi-sev-snp.x86_64-latest+amdsev.xml} (88%)
create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.xml
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-auto-efi-sev-stateful.x86_64-latest+amdsev.args} (75%)
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-auto-efi-sev-stateful.x86_64-latest+amdsev.xml} (78%)
create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.xml
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-auto-efi-sev.x86_64-latest+amdsev.args} (78%)
copy tests/qemuxmlconfdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-auto-efi-sev.x86_64-latest+amdsev.xml} (88%)
create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-sev.xml
--
2.51.0
