Accepting request 942190 from home:joeyli:branches:Virtualization
Removed useless patch files because they are merged to edk2-stable202111 OBS-URL: https://build.opensuse.org/request/show/942190 OBS-URL: https://build.opensuse.org/package/show/Virtualization/ovmf?expand=0&rev=212
This commit is contained in:
Joey Lee
Git OBS Bridge
parent
b7ecc166d1
commit
d716fdba52
@ -1,38 +0,0 @@
|
||||
From 4473834e7d49c555eca81f96383a1d6d6f5f4bb2 Mon Sep 17 00:00:00 2001
|
||||
From: Anthony PERARD <anthony.perard@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.perard@citrix.com>
|
||||
Acked-by: Lee, Chun-Yi <jlee@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
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From 9f3eda177a4b2d4a33ff1b0307cad42906396562 Mon Sep 17 00:00:00 2001
|
||||
From: "Lin, Gary (HPS OE-Linux)" <gary.lin@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.lin@hpe.com>
|
||||
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
|
||||
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
|
||||
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Tested-by: Jim Fehlig <jfehlig@suse.com>
|
||||
Acked-by: Lee, Chun-Yi <jlee@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
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
From cb0d24637dfdd869618b9635dfb8e3b0746393a6 Mon Sep 17 00:00:00 2001
|
||||
From: "Lin, Gary (HPS OE-Linux)" <gary.lin@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.lin@hpe.com>
|
||||
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
|
||||
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
|
||||
Tested-by: Jim Fehlig <jfehlig@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
|
||||
|
||||
15
ovmf.changes
15
ovmf.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 23 03:31:18 UTC 2021 - jlee@suse.com
|
||||
|
||||
- Removed useless patch files because they are merged to edk2-stable202111
|
||||
- ovmf-OvmfPkg-OvmfXen-Fix-build-with-QemuKernelLoaderFsDxe.patch
|
||||
- ovmf-OvmfPkg-OvmfXen-add-QemuKernelLoaderFsDxe.patch
|
||||
- ovmf-OvmfPkg-OvmfXen-set-PcdAcpiS3Enable-at-initializatio.patch
|
||||
- Updated URL to the edk2 repo on github
|
||||
- Use downloaded edk2-edk2-stable%{version}.tar.gz instead of the URL
|
||||
for Source0 because the edk2-edk2-stable202111 tarball is broken
|
||||
in tianocore repo which can not pass the "osc service runall download_files"
|
||||
testing.
|
||||
- We ill change it back to the following setting when upstream fixed tarball:
|
||||
Source0: https://github.com/tianocore/edk2/releases/download/edk2-stable%{version}/edk2-edk2-stable%{version}.tar.gz
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 21 03:29:06 UTC 2021 - Joey Lee <jlee@suse.com>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -27,8 +27,8 @@ 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/releases/download/edk2-stable%{version}/edk2-edk2-stable%{version}.tar.gz
|
||||
Url: https://github.com/tianocore/edk2
|
||||
Source0: 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user