[Qemu-commits] [qemu/qemu] af7c39: hw/i386/pc: pc_system_ovmf_table_find: Assert that...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: af7c398b0de73d0b63844b31ca7997705958ca7d
      
https://github.com/qemu/qemu/commit/af7c398b0de73d0b63844b31ca7997705958ca7d
  Author: Dov Murik <dovmurik@linux.ibm.com>
  Date:   2021-07-12 (Mon, 12 Jul 2021)

  Changed paths:
    M hw/i386/pc_sysfw.c

  Log Message:
  -----------
  hw/i386/pc: pc_system_ovmf_table_find: Assert that flash was parsed

Add assertion in pc_system_ovmf_table_find that verifies that the flash
was indeed previously parsed (looking for the OVMF table) by
pc_system_parse_ovmf_flash.

Now pc_system_ovmf_table_find distinguishes between "no one called
pc_system_parse_ovmf_flash" (which will abort due to assertion failure)
and "the flash was parsed but no OVMF table was found, or it is invalid"
(which will return false).

Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210701052749.934744-2-dovmurik@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: 3f0b9e8f06e4a367d85ca8ade2e4bae864879a89
      
https://github.com/qemu/qemu/commit/3f0b9e8f06e4a367d85ca8ade2e4bae864879a89
  Author: Dov Murik <dovmurik@linux.ibm.com>
  Date:   2021-07-12 (Mon, 12 Jul 2021)

  Changed paths:
    M hw/i386/pc_sysfw.c

  Log Message:
  -----------
  hw/i386/pc: Document pc_system_ovmf_table_find

Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210701052749.934744-3-dovmurik@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: fc3debb0650abe639b3f1a785d126ddc26e25185
      
https://github.com/qemu/qemu/commit/fc3debb0650abe639b3f1a785d126ddc26e25185
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-07-12 (Mon, 12 Jul 2021)

  Changed paths:
    M MAINTAINERS
    M hw/i386/Kconfig
    M hw/i386/meson.build
    M hw/i386/pc_sysfw.c
    A hw/i386/pc_sysfw_ovmf-stubs.c
    A hw/i386/pc_sysfw_ovmf.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw/i386: Introduce X86_FW_OVMF Kconfig symbol

Introduce the X86_FW_OVMF Kconfig symbol for OVMF-specific code.
Move the OVMF-specific code from pc_sysfw.c to pc_sysfw_ovmf.c,
adding a pair of stubs.
Update MAINTAINERS to reach OVMF maintainers when these new
files are modified.

This fixes when building the microvm machine standalone:

  /usr/bin/ld: libqemu-i386-softmmu.fa.p/target_i386_monitor.c.o: in
  function `qmp_sev_inject_launch_secret':
  target/i386/monitor.c:749: undefined reference to `pc_system_ovmf_table_find'

Fixes: f522cef9b35 ("sev: update sev-inject-launch-secret to make gpa optional")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20210616204328.2611406-22-philmd@redhat.com>


  Commit: d1e79210457323b225c369fa00e97577e0d0da95
      
https://github.com/qemu/qemu/commit/d1e79210457323b225c369fa00e97577e0d0da95
  Author: Laszlo Ersek <lersek@redhat.com>
  Date:   2021-07-12 (Mon, 12 Jul 2021)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: remove Laszlo Ersek's entries

I've relinquished my edk2 roles with the following commit message [1] [2]
[3]:

> Maintainers.txt: remove Laszlo Ersek's entries
>
> I'm relinquishing all my roles listed in "Maintainers.txt", for personal
> reasons.
>
> My email address <lersek@redhat.com> remains functional.
>
> To my understanding, my employer is working to assign others engineers
> to the edk2 project (at their discretion).

[1] https://edk2.groups.io/g/devel/message/77585
[2] 
https://listman.redhat.com/archives/edk2-devel-archive/2021-July/msg00202.html
[3] http://mid.mail-archive.com/20210708070916.8937-1-lersek@redhat.com

Accordingly, remove my entries from QEMU's MAINTAINERS file as well, which
all relate to guest firmware.

Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Kashyap Chamarthy <kchamart@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210708071409.9671-1-lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: dff9384cc27d19b6d08498e4a7a78d335bcebcb0
      
https://github.com/qemu/qemu/commit/dff9384cc27d19b6d08498e4a7a78d335bcebcb0
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-13 (Tue, 13 Jul 2021)

  Changed paths:
    M MAINTAINERS
    M hw/i386/Kconfig
    M hw/i386/meson.build
    M hw/i386/pc_sysfw.c
    A hw/i386/pc_sysfw_ovmf-stubs.c
    A hw/i386/pc_sysfw_ovmf.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/philmd/tags/fw-edk2-20210712' into 
staging

Patches related to EDK2/OVMF

- MAINTAINERS: remove Laszlo Ersek's entries
- Introduce X86_FW_OVMF Kconfig symbol
- pc_system_ovmf_table_find: Assert that flash was parsed, document

# gpg: Signature made Mon 12 Jul 2021 15:55:40 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" 
[full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd/tags/fw-edk2-20210712:
  MAINTAINERS: remove Laszlo Ersek's entries
  hw/i386: Introduce X86_FW_OVMF Kconfig symbol
  hw/i386/pc: Document pc_system_ovmf_table_find
  hw/i386/pc: pc_system_ovmf_table_find: Assert that flash was parsed

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/9a0e86aeeabe...dff9384cc27d