Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ovmf for openSUSE:Factory checked in at 2021-10-29 22:32:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ovmf (Old) and /work/SRC/openSUSE:Factory/.ovmf.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovmf" Fri Oct 29 22:32:58 2021 rev:66 rq:927626 version:202108 Changes: -------- --- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes 2021-07-16 22:12:45.962820085 +0200 +++ /work/SRC/openSUSE:Factory/.ovmf.new.1890/ovmf.changes 2021-10-29 22:33:06.655656685 +0200 @@ -1,0 +2,321 @@ +Tue Oct 26 07:38:52 UTC 2021 - j...@suse.com + +- Removed patches which are merged to mainline: + ovmf-bsc1186151-fix-iscsi-overflows.patch + ovmf-xen-relocate-shared_info_page-map.patch +- Removed patches because replaced: + ovmf-fix-xen-s3-detection.patch -> ovmf-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch + ovmf-xen-add-qemu-kernel-loader-fs.patch -> ovmf-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch + +------------------------------------------------------------------- +Fri Oct 22 07:09:41 UTC 2021 - j...@suse.com + +- Removed edk2-stable202105.tar.gz because we updated to edk2-stable202108 + +------------------------------------------------------------------- +Thu Oct 14 03:24:33 UTC 2021 - j...@suse.com + +- Update to edk2-stable202108 + - Features (https://github.com/tianocore/edk2/releases): + OvmfPkg: remove Xen support from OvmfPkg*.dsc, in favor of OvmfXen.dsc + Add CLANGDWARF toolchain for generating ELF+DWARF + NetworkPkg/IScsiDxe: remotely exploitable buffer overflows + NetworkPkg/IScsiDxe: add sha256 support to CHAP + Create header files and multiple Hobs for Universal Payload + Add search feature in config editor + Add additional build option to treat Dynamic Pcd as DynamicEx Pcd + Add a new MicrocodeLib for microcode loading + Implement key enrolment from default key variables + StandaloneMm support for 32bit Arm machines + Add firmware support for Cloud Hypervisor on arm64 + Support architecture-specific openssl acceleration + Support measured AMD SEV boot with kernel/initrd/cmdline + Add ACPI 6.4 header + Add new BootDiscoveryPolicyUiLib + - Patches (git log --oneline --reverse edk2-stable202105~..edk2-stable202108): + e1999b264f ArmPkg/ArmGic: Fix maximum number of interrupts in GICv3 + b8ed8c0fb2 Maintainers.txt: add Sami Mujawar as top-level ArmVirtPkg reviewer + dbc22a1785 UefiCpuPkg/MpInitLib: Allocate a separate SEV-ES AP reset stack area + 0095070e70 MdePkg/Register/Amd: expand the SEV MSR to include the SNP definition + f828fc9876 MdePkg/Register/Amd: realign macros with more space for future expansion + 34e16ff883 MdePkg/Register/Amd: define GHCB macros for hypervisor feature detection + f0983b2074 MdePkg/Register/Amd: define GHCB macro for Register GPA structure + 4665fa6503 MdePkg/Register/Amd: define GHCB macro for the Page State Change + dfd41aef78 MdePkg/Register/Amd: define GHCB macros for SNP AP creation + 5a7cbd54a1 MdePkg/BaseLib: add support for PVALIDATE instruction + 2b5b2ff04d MdePkg/BaseLib: add support for RMPADJUST instruction + 901a9bfc3a OvmfPkg/BaseMemEncryptSevLib: introduce MemEncryptSevClearMmioPageEncMask() + c394fa4c9e OvmfPkg/AmdSevDxe: use MemEncryptSevClearMmioPageEncMask() to clear EncMask + 8ee4e52ba8 OvmfPkg/QemuFlashFvbServicesRuntimeDxe: use Mmio helper to clear enc mask + b4a8de5d27 OvmfPkg/TpmMmioSevDecryptPei: use MemEncryptSevClearMmioPageEncMask() + adfa3327d4 OvmfPkg/BaseMemEncryptSevLib: remove Flush parameter + fe5da0927a IntelFsp2WrapperPkg: Remove microcode related PCDs + d3ff5dbe1d MdePkg: MmControl: Fix function and structure definition mismatches + 197e27c90a MdePkg: Add new 16550-compatible Serial Port Subtypes to DBG2 + fdf3666f01 MdePkg: Update DBG2 and SPCR header with NVIDIA 16550 Subtype + b233eb1849 EmbeddedPkg/RealTimeClockRuntimeDxe: Improve GetWakeupTime + b5379899b3 MdeModulePkg/Xhci: Fix TRT when data length is 0 + 039e07f626 MdePkg/MdeModulePkg: Move AML_NAME_SEG_SIZE definition + 1f515342d8 DynamicTablesPkg: Use AML_NAME_SEG_SIZE define + 75e9154f81 OvmfPkg/VirtioMmioDeviceLib: Add EFIAPI to VirtioMmioSetQueueAddress + c410ad4da4 MdePkg/BaseLib: Fix AsmReadSs() with GCC toolchain + c1aa3bab12 BaseTools: Add ClangBase.lds for CLANG8 tool chain with max-page-size + c6b872c6ab BaseTools GenFw: Support CLANG8ELF with conversion ELF to PE/COFF image + cf9959adff BaseTools: Update build_rule to skip CLANG resource section generation + 4b56ad2049 BaseTools: Add new CLANG8ELF tool chain for new LLVM/CLANG8 + e1636fe18f BaseTools: Update ClangBase.lds to keep dynamic section + 924c2b847f BaseTools: Change CLANG8ELF to CLANGDWARF + e25566cd2b OvmfPkg: remove the Xen drivers from the IA32, IA32X64, and X64 platforms + aa7f19f480 OvmfPkg: remove the Xen drivers from the AmdSev platform + 7bc04a75a7 OvmfPkg: switch IA32, IA32X64, X64 to the fw_cfg-only ACPI platform driver + d697037446 OvmfPkg: switch the AmdSev platform to the fw_cfg-only ACPI platform driver + ae4aa4a346 OvmfPkg/README: bump minimum QEMU version to 1.7.1, machine types to 1.7 + 2a85d9b07e OvmfPkg/AcpiPlatformDxe: fix header file warts + 180f1908b3 OvmfPkg/AcpiPlatformDxe: sort #includes and [LibraryClasses] + 6d1e56e715 OvmfPkg/AcpiPlatformDxe/QemuLoader.h: remove QemuFwCfgLib class dependency + 747b1ef725 OvmfPkg/AcpiPlatformDxe: move "QemuLoader.h" to IndustryStandard + cc302b799e OvmfPkg/AcpiPlatformDxe: consolidate #includes and [LibraryClasses] + c9bba52fc7 OvmfPkg/XenAcpiPlatformDxe: create from AcpiPlatformDxe + a31fcb5096 OvmfPkg/AcpiPlatformDxe: remove the "AcpiPlatformDxe.inf" driver + 4115840c28 OvmfPkg/XenAcpiPlatformDxe: remove the QEMU ACPI linker/loader client + d6ba8aa6ef OvmfPkg/XenAcpiPlatformDxe: remove QEMU fw_cfg dependency + 3f975ee570 OvmfPkg/XenAcpiPlatformDxe: remove the InstallAcpiTable() helper function + 8f8d3d90c5 OvmfPkg/XenAcpiPlatformDxe: remove OVMF's built-in ACPI tables + 4174c5c787 OvmfPkg/Bhyve/AcpiPlatformDxe: fix file path typo in comment + d491c88a0c OvmfPkg/AcpiTables: remove unused module + e7641171b6 OvmfPkg/OvmfXen: make "PcdPciDisableBusEnumeration" Fixed-at-Build + 3357ac7380 OvmfPkg/XenAcpiPlatformDxe: remove delayed ACPI table installation + d06eb2d1d9 OvmfPkg/PlatformPei: remove Xen support + 8899e3fe6a OvmfPkg: drop PcdPciDisableBusEnumeration from the IA32, IA32X64, X64 DSCs + 2833589ad0 OvmfPkg: drop PcdPciDisableBusEnumeration from the AmdSev platform + e43cca74ad OvmfPkg/Bhyve: make "PcdPciDisableBusEnumeration" Fixed-at-Build + b005f9f1f5 OvmfPkg/OvmfXen: remove IncompatiblePciDeviceSupport DXE driver + 8c8f886f27 OvmfPkg/Bhyve: remove IncompatiblePciDeviceSupport DXE driver + 984c93ece3 OvmfPkg/IncompatiblePciDeviceSupportDxe: remove PcdPciDisableBusEnumeration + 32fef03563 OvmfPkg/PciHostBridgeLib: consolidate #includes and INF file sections + e120c962f5 OvmfPkg/PciHostBridgeLibScan: create from PciHostBridgeLib + c2f24ba321 OvmfPkg/Bhyve: consume PciHostBridgeLibScan + 307763c3da OvmfPkg/OvmfXen: consume PciHostBridgeLibScan + 242678da2a OvmfPkg/PciHostBridgeLib: remove Bhyve and Xen support + 33d4f3e39e OvmfPkg/PciHostBridgeLibScan: remove QEMU (fw_cfg) support + 4c81178cf0 OvmfPkg/PciHostBridgeLibScan: remove PcdOvmfHostBridgePciDevId + 8af38170b5 OvmfPkg/PciHostBridgeLibScan: clean up file names and file-top comments + 7e25086a00 OvmfPkg/SmbiosPlatformDxe: clean up #includes and INF + 5072593738 OvmfPkg/SmbiosPlatformDxe: return EFI_NOT_FOUND if there is no SMBIOS data + 4db374562f OvmfPkg/SmbiosPlatformDxe: locate SMBIOS protocol in InstallAllStructures() + a8ab14424e OvmfPkg/SmbiosPlatformDxe: split GetXenSmbiosTables() decl. to new header + 9d84e74ca0 OvmfPkg/SmbiosPlatformDxe: declare InstallAllStructures() in header file + d4a8aaee73 OvmfPkg/SmbiosPlatformDxe: create Xen-specific module INF file + ce270905bf OvmfPkg/SmbiosPlatformDxe: split Xen entry point from QEMU entry point + 51adb689e1 OvmfPkg: restrict XenPlatformLib to BdsDxe in the IA32, IA32X64, X64 DSCs + ddb3fdbef3 BaseTools GenFw: Fix regression issue to convert the image to ACPI data + 558d83ab1a OvmfPkg/README: Fix typo in README + beb443fde0 ShellPkg: Fix typo + 702ba436ed OvmfPkg/PlatformCI: bump QEMU choco package version to 2021.5.5 + 83761337ec NetworkPkg/IScsiDxe: wrap IScsiCHAP source files to 80 characters + 29cab43bb7 NetworkPkg/IScsiDxe: simplify "ISCSI_CHAP_AUTH_DATA.InChallenge" size + 95616b8661 NetworkPkg/IScsiDxe: clean up "ISCSI_CHAP_AUTH_DATA.OutChallengeLength" + e8f28b09e6 NetworkPkg/IScsiDxe: clean up library class dependencies + cf01b2dc8f NetworkPkg/IScsiDxe: fix potential integer overflow in IScsiBinToHex() + d90fff40cb NetworkPkg/IScsiDxe: assert that IScsiBinToHex() always succeeds + dc469f1371 NetworkPkg/IScsiDxe: reformat IScsiHexToBin() leading comment block + 47b76780b4 NetworkPkg/IScsiDxe: fix IScsiHexToBin() hex parsing + 54e90edaed NetworkPkg/IScsiDxe: fix IScsiHexToBin() buffer overflow + b8649cf2a3 NetworkPkg/IScsiDxe: check IScsiHexToBin() return values + 288bd74a22 Pytool: SpellCheck: Fix incorrect file mask across package matrices + 1ad794b627 MdeModulePkg: Fix device path when boot manager menu is from different FV + 11b1c1d4b9 SecurityPkg: TcgStorageOpalLib: Initialize SupportedAttributes parameter. + d58016b768 UefiPayloadPkg: Get platform specific logic via protocol for BDS + d8c18ba3f4 MdeModulePkg: Add Universal Payload general definition header file + b597b6e24c MdeModulePkg: Add new structure for the PCI Root Bridge Info Hob + 99de2e7e03 UefiPayloadPkg: UefiPayload retrieve PCI root bridge from Guid Hob + 9d53e01efe MdeModulePkg: Add new structure for the Universal Payload SMBios Table Hob + 70e8c9c3bc MdeModulePkg/Universal/SmbiosDxe: Scan for existing tables + 302a8f353c UefiPayloadPkg: Create gUniversalPayloadSmbiosTableGuid Hob + 75293330ea MdeModulePkg: Add new structure for the Universal Payload ACPI Table Hob + 761329ee27 MdeModulePkg/ACPI: Install ACPI table from HOB. + 8c0d678063 UefiPayloadPkg: Create gUniversalPayloadAcpiTableGuid Hob + fa24b6ed26 UefiPayloadPkg: Use DynamicEx instead of Dynamic to pass PCD across binary + c511426abe MdeModulePkg/UniversalPayload: Add definition for extra info in payload + fe471d4a57 UefiPayloadPkg: Add PayloadLoaderPeim which can load ELF payload + ab2b389e7a PeiCore: Remove assertion when failing to load PE image + 1b380aa603 BaseTools GenFw: Keep read only alloc section as text when convert ELF + 9cf9de668f StandaloneMmPkg: Core: Spelling error in comment + 610385fa3b ArmPlatformPkg: SpellCheck: Switch spellcheck CI to AuditOnly + 04ddd1271e ArmPkg: SpellCheck: Update valid acronyms in ExtendedWords + cdf7544703 MdeModulePkg PciBusDxe: Increase the width of data read during oprom shadow + 2847c72fda Maintainers.txt: Add Reviewers for Universal Payload definitions + 1162ae8297 Maintainers.txt: Add reviewers for ACPI and SMBIOS modules + a63914d3f6 ArmPkg: Move cache defs used in Universal/Smbios into ArmCache.h + 6cfeeb71c4 UefiCpuPkg/CpuCommonFeaturesLib: Correct the CPU location check + d9a7612f8d MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy + 5959879e92 ArmVirtPkg: Add PCIe host bridge utility lib for ArmVirtPkg + 4dda0f7ab4 ArmVirtPkg: Enable PCIe support for Kvmtool + 1e5e58d39b UefiPayloadPkg/UefiPayloadEntry: Improve bootloader memrange parsing + 7471751a4d UefiPayloadPkg/UefiPayloadEntry: Remove 4GB memory WA + 20ca528828 CryptoPkg: BaseCryptLib: Update Salt length requirement for RSA-PSS scheme. + 18b2272e4d Azurepipeline: SpellCheck: Enforce Node dependency to use version 14.x + eba32695ee CryptoPkg/BaseCryptLib: Enabled CryptSha512 for Smm/Runtime drivers + 12e34cd2f7 OvmfPkg/Bhyve: clean up TPM_ENABLE remnants + 82f727c4af UefiPayloadPkg: Add HobLib for UniversalPayload + ea0bd5f6a7 MdeModulePkg: Add new structure for the Universal Payload Serial Port Info + a75c029f60 UefiPayloadPkg: Add a separate PlatformHookLib for Universal Payload + d63595c3c9 UefiPayloadPkg: Update the function definition of HobConstructor + 0ff6de9358 UefiPayloadPkg: Create separate Payload Entry for UniversalPayload + b208d37c73 UefiPayloadPkg: Get and enter DxeCore for Universal Payload + 27cb64fffc UefiPayloadPkg: Fix up UPL Pcd database + 6b69f73b59 UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc + 86e6948cfb UefiPayloadPkg: Remove assert when reserve MMIO/IO resource for devices + 2db0ed93ff UefiPayloadPkg: Add macro to enable and disable some drivers + 3eb72b308a UefiPayloadPkg: Add PcdInstallAcpiSdtProtocol feature in UefiPayloadPkg + caa139fe17 UefiPayloadPkg: Add PcdResetOnMemoryTypeInformationChange in UefiPayloadPkg + 8efd912baf UefiPayloadPkg: Add new structure for BootManagerMenuFile HOB + 19a541d70e UefiPayloadPkg: consume the BootManagerMenuFile HOB + 333a866106 BaseTools: Remove check for Split.exe in toolset.bat + f0a3f6d9c3 BaseTools: Fix spelling of "overwrite" and "overwriting" in toolset.bat + 17143c4837 BaseTools: Reset ERRORLEVEL in toolsetup.bat after edk2basetools check + abfff7c45d BaseTools GenFw: Add support for RISCV GOT/PLT relocations + 27b8a52957 MdePkg: MmConfiguration: Move definition of EFI_MM_RESERVED_MMRAM_REGION + d1fc3d7ef3 MdePkg: MmConfiguration: Added definition of MM Configuration PPI + 5a2e030f73 OvmfPkg/GenericQemuLoadImageLib: plug cmdline blob leak on success + 932449710c OvmfPkg/X86QemuLoadImageLib: plug cmdline blob leak on success + 24b0e9d128 Revert "OvmfPkg/QemuKernelLoaderFsDxe: don't expose kernel command line" + cf20302474 OvmfPkg/GenericQemuLoadImageLib: Read cmdline from QemuKernelLoaderFs + 9421f5ab8d OvmfPkg/X86QemuLoadImageLib: State fw_cfg dependency in file header + b37cfdd280 OvmfPkg/XenPlatformPei: Relocate shared_info page mapping + 55dee4947b MdePkg : Add IPMI Macro and Structure Defintions to resolve build errors + 580b11201e IntelFsp2Pkg: Add Config Editor tool support + 939ed3a592 UefiPayloadPkg/PayloadLoader: Fix bug in locating relocation section + 3cde0d553d UefiPayloadPkg/PayloadLoader: Remove assertion + 49eeda113a NetworkPkg/IScsiDxe: re-set session-level authentication state before login + 7eba9f698e NetworkPkg/IScsiDxe: add horizontal whitespace to IScsiCHAP files + 7b6c2b2a26 NetworkPkg/IScsiDxe: distinguish "maximum" and "selected" CHAP digest sizes + 903ce1d8f8 NetworkPkg/IScsiDxe: support multiple hash algorithms for CHAP + 47fea2abcb NetworkPkg/IScsiDxe: support SHA256 in CHAP + bb33c27fbe NetworkPkg: introduce the NETWORK_ISCSI_MD5_ENABLE feature test macro + 8697dc60cc Maintainers.txt: Update Maintainers and reviewers for UefiPayloadPkg + fea7901dba UefiPayloadPkg: Fix the build failure ++++ 124 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ovmf/ovmf.changes ++++ and /work/SRC/openSUSE:Factory/.ovmf.new.1890/ovmf.changes Old: ---- edk2-stable202105.tar.gz ovmf-bsc1186151-fix-iscsi-overflows.patch ovmf-fix-xen-s3-detection.patch ovmf-xen-add-qemu-kernel-loader-fs.patch ovmf-xen-relocate-shared_info_page-map.patch New: ---- edk2-edk2-stable202108.tar.gz ovmf-OvmfPkg-OvmfXen-Fix-build-with-QemuKernelLoaderFsDxe.patch ovmf-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch ovmf-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ovmf.spec ++++++ --- /var/tmp/diff_new_pack.NRDLxi/_old 2021-10-29 22:33:07.415656972 +0200 +++ /var/tmp/diff_new_pack.NRDLxi/_new 2021-10-29 22:33:07.419656974 +0200 @@ -1,7 +1,7 @@ # # spec file for package ovmf # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # needssslcertforbuild @@ -22,13 +22,13 @@ %global softfloat_version b64af41c3276f Name: ovmf -Version: 202105 +Version: 202108 Release: 0 Summary: Open Virtual Machine Firmware License: BSD-2-Clause-Patent Group: System/Emulators/PC -URL: https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2 -Source0: https://github.com/tianocore/edk2/archive/edk2-stable%{version}.tar.gz +Url: https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2 +Source0: https://github.com/tianocore/edk2/releases/download/edk2-stable%{version}/edk2-edk2-stable%{version}.tar.gz Source1: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz Source111: https://www.openssl.org/source/openssl-%{openssl_version}.tar.gz.asc Source112: openssl.keyring @@ -51,10 +51,9 @@ Patch4: %{name}-disable-ia32-firmware-piepic.patch Patch5: %{name}-set-fixed-enroll-time.patch Patch6: %{name}-disable-brotli.patch -Patch7: %{name}-bsc1186151-fix-iscsi-overflows.patch -Patch8: %{name}-xen-relocate-shared_info_page-map.patch -Patch9: %{name}-fix-xen-s3-detection.patch -Patch10: %{name}-xen-add-qemu-kernel-loader-fs.patch +Patch7: %{name}-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch +Patch8: %{name}-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch +Patch9: %{name}-OvmfPkg-OvmfXen-Fix-build-with-QemuKernelLoaderFsDxe.patch BuildRequires: bc BuildRequires: cross-arm-binutils BuildRequires: cross-arm-gcc%{gcc_version} @@ -175,7 +174,6 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 # add openssl pushd CryptoPkg/Library/OpensslLib/openssl ++++++ ovmf-OvmfPkg-OvmfXen-Fix-build-with-QemuKernelLoaderFsDxe.patch ++++++ >From 4473834e7d49c555eca81f96383a1d6d6f5f4bb2 Mon Sep 17 00:00:00 2001 From: Anthony PERARD <anthony.per...@citrix.com> Date: Mon, 6 Sep 2021 15:02:42 +0100 Subject: [PATCH] OvmfPkg/OvmfXen: Fix build with QemuKernelLoaderFsDxe VerifyBlob() has been added recently to QemuKernelLoaderFsDxe, also QemuKernelLoaderFsDxe has been added recently to OvmfXen but without an implementation of VerifyBlob(). Fix this by adding the same runes that have been added to OvmfPkgX64.dsc. Fixes: 9f3eda177a4b ("OvmfPkg/OvmfXen: add QemuKernelLoaderFsDxe") Signed-off-by: Anthony PERARD <anthony.per...@citrix.com> Acked-by: Lee, Chun-Yi <j...@suse.com> --- OvmfPkg/OvmfXen.dsc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 1a9c06c164..a31519e356 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -587,7 +587,10 @@ NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf !endif } - OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf + OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf { + <LibraryClasses> + NULL|OvmfPkg/Library/BlobVerifierLibNull/BlobVerifierLibNull.inf + } OvmfPkg/XenIoPvhDxe/XenIoPvhDxe.inf OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf OvmfPkg/XenBusDxe/XenBusDxe.inf -- 2.12.3 ++++++ ovmf-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch ++++++ >From 9f3eda177a4b2d4a33ff1b0307cad42906396562 Mon Sep 17 00:00:00 2001 From: "Lin, Gary (HPS OE-Linux)" <gary....@hpe.com> Date: Tue, 31 Aug 2021 09:29:48 +0800 Subject: [PATCH] OvmfPkg/OvmfXen: add QemuKernelLoaderFsDxe Without QemuKernelLoaderFsDxe, QemuLoadKernelImage() couldn't download the kernel, initrd, and kernel command line from QEMU's fw_cfg. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3574 Signed-off-by: Gary Lin <gary....@hpe.com> Acked-by: Anthony PERARD <anthony.per...@citrix.com> Reviewed-by: Philippe Mathieu-Daude <phi...@redhat.com> Reviewed-by: Gerd Hoffmann <kra...@redhat.com> Tested-by: Jim Fehlig <jfeh...@suse.com> Acked-by: Lee, Chun-Yi <j...@suse.com> --- OvmfPkg/OvmfXen.dsc | 1 + OvmfPkg/OvmfXen.fdf | 1 + 2 files changed, 2 insertions(+) diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 3c1ca6bfd4..1a9c06c164 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -587,6 +587,7 @@ NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf !endif } + OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf OvmfPkg/XenIoPvhDxe/XenIoPvhDxe.inf OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf OvmfPkg/XenBusDxe/XenBusDxe.inf diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index aeb9336fd5..8b58235559 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -324,6 +324,7 @@ INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf +INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf -- 2.12.3 ++++++ ovmf-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch ++++++ >From cb0d24637dfdd869618b9635dfb8e3b0746393a6 Mon Sep 17 00:00:00 2001 From: "Lin, Gary (HPS OE-Linux)" <gary....@hpe.com> Date: Tue, 31 Aug 2021 09:31:12 +0800 Subject: [PATCH] OvmfPkg/OvmfXen: set PcdAcpiS3Enable at initialization There are several functions in OvmfPkg/Library using QemuFwCfgS3Enabled() to detect the S3 support status. However, in MdeModulePkg, PcdAcpiS3Enable is used to check S3 support. Since InitializeXenPlatform() didn't set PcdAcpiS3Enable as InitializePlatform() did, this made the inconsistency between drivers/functions. For example, S3SaveStateDxe checked PcdAcpiS3Enable and skipped S3BootScript because the default value is FALSE. On the other hand, PlatformBootManagerBeforeConsole() from OvmfPkg/Library called QemuFwCfgS3Enabled() and found it returned TRUE, so it invoked SaveS3BootScript(). However, S3SaveStateDxe skipped S3BootScript, so SaveS3BootScript() asserted due to EFI_NOT_FOUND. This issue mainly affects "HVM Direct Kernel Boot". When used, "fw_cfg" is enabled in QEMU and QemuFwCfgS3Enabled() returns true in that case. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3573 Signed-off-by: Gary Lin <gary....@hpe.com> Reviewed-by: Anthony PERARD <anthony.per...@citrix.com> Reviewed-by: Gerd Hoffmann <kra...@redhat.com> Reviewed-by: Jiewen Yao <jiewen....@intel.com> Tested-by: Jim Fehlig <jfeh...@suse.com> --- OvmfPkg/XenPlatformPei/Platform.c | 13 +++++++++++++ OvmfPkg/XenPlatformPei/XenPlatformPei.inf | 2 ++ 2 files changed, 15 insertions(+) diff --git a/OvmfPkg/XenPlatformPei/Platform.c b/OvmfPkg/XenPlatformPei/Platform.c index a811e72ee3..e60478fdb4 100644 --- a/OvmfPkg/XenPlatformPei/Platform.c +++ b/OvmfPkg/XenPlatformPei/Platform.c @@ -26,6 +26,7 @@ #include <Library/PciLib.h> #include <Library/PeimEntryPoint.h> #include <Library/PeiServicesLib.h> +#include <Library/QemuFwCfgS3Lib.h> #include <Library/ResourcePublicationLib.h> #include <Guid/MemoryTypeInformation.h> #include <Ppi/MasterBootMode.h> @@ -423,6 +424,8 @@ InitializeXenPlatform ( IN CONST EFI_PEI_SERVICES **PeiServices ) { + EFI_STATUS Status; + DEBUG ((DEBUG_INFO, "Platform PEIM Loaded\n")); DebugDumpCmos (); @@ -433,6 +436,16 @@ InitializeXenPlatform ( CpuDeadLoop (); } + // + // This S3 conditional test is mainly for HVM Direct Kernel Boot since + // QEMU fwcfg isn't really supported other than that. + // + if (QemuFwCfgS3Enabled ()) { + DEBUG ((DEBUG_INFO, "S3 support was detected on QEMU\n")); + Status = PcdSetBoolS (PcdAcpiS3Enable, TRUE); + ASSERT_EFI_ERROR (Status); + } + XenConnect (); BootModeInitialization (); diff --git a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf b/OvmfPkg/XenPlatformPei/XenPlatformPei.inf index 597cb6fcd7..20c27ff34b 100644 --- a/OvmfPkg/XenPlatformPei/XenPlatformPei.inf +++ b/OvmfPkg/XenPlatformPei/XenPlatformPei.inf @@ -57,6 +57,7 @@ ResourcePublicationLib PeiServicesLib PeimEntryPoint + QemuFwCfgS3Lib MtrrLib MemEncryptSevLib PcdLib @@ -79,6 +80,7 @@ gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Base gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode -- 2.12.3
