[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] ac0595: gitlab-ci: Extract EDK2 job rules to
From: |
Peter Maydell |
Subject: |
[Qemu-commits] [qemu/qemu] ac0595: gitlab-ci: Extract EDK2 job rules to reusable section |
Date: |
Thu, 15 Jul 2021 05:44:32 -0700 |
Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: ac0595cf6b36cc39f2a926bd519416c32cb5667d
https://github.com/qemu/qemu/commit/ac0595cf6b36cc39f2a926bd519416c32cb5667d
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: 2021-07-14 (Wed, 14 Jul 2021)
Changed paths:
M .gitlab-ci.d/edk2.yml
Log Message:
-----------
gitlab-ci: Extract EDK2 job rules to reusable section
All jobs depending on 'docker-edk2' job must use at most all
the rules that triggers it. The simplest way to ensure that
is to always use the same rules. Extract all the rules to a
reusable section, and include this section (with the 'extends'
keyword) in both 'docker-edk2' and 'build-edk2' jobs.
The problem was introduced in commit 71920809cea ("gitlab-ci.yml:
Add jobs to build EDK2 firmware binaries"), but was revealed in
commit 1925468ddbf ("docker: EDK2 build job depends on EDK2
container") and eventually failed on CI:
https://gitlab.com/qemu-project/qemu/-/pipelines/335995843
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210714101003.3113726-1-philmd@redhat.com>
Commit: 35ebc321b476c0b9e573bc6fb412d773fb4a36d5
https://github.com/qemu/qemu/commit/35ebc321b476c0b9e573bc6fb412d773fb4a36d5
Author: Dov Murik <dovmurik@linux.ibm.com>
Date: 2021-07-14 (Wed, 14 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: 2165542c8d21c01d1f470560ab7d86b3fee8eac4
https://github.com/qemu/qemu/commit/2165542c8d21c01d1f470560ab7d86b3fee8eac4
Author: Dov Murik <dovmurik@linux.ibm.com>
Date: 2021-07-14 (Wed, 14 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: b5b318608e20464c7136eb5a5f5f3307e9f90510
https://github.com/qemu/qemu/commit/b5b318608e20464c7136eb5a5f5f3307e9f90510
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: 2021-07-14 (Wed, 14 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: 2669350db2c3df33f4e68c518e9f31f91502a83d
https://github.com/qemu/qemu/commit/2669350db2c3df33f4e68c518e9f31f91502a83d
Author: Laszlo Ersek <lersek@redhat.com>
Date: 2021-07-14 (Wed, 14 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: f665574ac5b08284e5292f013235bef2e9d4e73d
https://github.com/qemu/qemu/commit/f665574ac5b08284e5292f013235bef2e9d4e73d
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2021-07-15 (Thu, 15 Jul 2021)
Changed paths:
M .gitlab-ci.d/edk2.yml
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-20210714' 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
- gitlab-ci: Fix the jobs building EDK2 blobs
# gpg: Signature made Wed 14 Jul 2021 21:36:33 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-20210714:
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
gitlab-ci: Extract EDK2 job rules to reusable section
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/6519c8133d2d...f665574ac5b0
- [Qemu-commits] [qemu/qemu] ac0595: gitlab-ci: Extract EDK2 job rules to reusable section,
Peter Maydell <=