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.

[v1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/RKQ3ANKDNJEFJSKQR4FMDU7PVHWYKYSF/

Andrea Bolognani (9):
  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 remove SEV features from non-SEV descriptors
  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     |  1 -
 .../50-edk2-ovmf-4m-qcow2-x64-nosb.json       |  2 -
 .../51-edk2-ovmf-2m-raw-x64-nosb.json         |  2 -
 .../firmware/60-edk2-ovmf-x64-amdsev.json     |  3 +-
 .../firmware/60-edk2-ovmf-x64-amdsevsnp.json} | 14 +++---
 .../usr/share/qemu/firmware/90-combined.json  |  5 +-
 tests/qemufirmwaretest.c                      |  4 +-
 ...ware-auto-efi-rw-pflash.x86_64-latest.args | 36 ++++++++++++++
 ...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   | 36 ++++++++++++++
 .../firmware-auto-efi-rw.x86_64-latest.err    |  1 -
 .../firmware-auto-efi-rw.x86_64-latest.xml    |  6 ++-
 ...auto-efi-sev-snp.x86_64-latest+amdsev.args | 35 ++++++++++++++
 ...auto-efi-sev-snp.x86_64-latest+amdsev.xml} |  9 +++-
 .../firmware-auto-efi-sev-snp.xml             | 20 ++++++++
 ...are-auto-efi-sev.x86_64-latest+amdsev.args | 36 ++++++++++++++
 ...are-auto-efi-sev.x86_64-latest+amdsev.xml} |  9 +++-
 .../qemuxmlconfdata/firmware-auto-efi-sev.xml | 20 ++++++++
 ...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 |  9 ++--
 ...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 |  9 ++--
 ...unch-security-sev.x86_64-latest+amdsev.xml | 29 ++++++------
 tests/qemuxmlconfdata/launch-security-sev.xml | 25 +++-------
 tests/qemuxmlconftest.c                       | 11 ++++-
 38 files changed, 352 insertions(+), 279 deletions(-)
 copy tests/qemufirmwaredata/{out/usr/share/qemu/firmware/60-edk2-ovmf-x64-amdsev.json => usr/share/qemu/firmware/60-edk2-ovmf-x64-amdsevsnp.json} (57%)
 create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.args
 delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.err
 create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args
 delete mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.err
 create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.args
 copy tests/qemuxmlconfdata/{firmware-auto-efi-rw-pflash.x86_64-latest.xml => firmware-auto-efi-sev-snp.x86_64-latest+amdsev.xml} (78%)
 create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.xml
 create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args
 copy tests/qemuxmlconfdata/{firmware-auto-efi-rw-pflash.x86_64-latest.xml => firmware-auto-efi-sev.x86_64-latest+amdsev.xml} (77%)
 create mode 100644 tests/qemuxmlconfdata/firmware-auto-efi-sev.xml

-- 
2.51.0