Copy the function BuildPlatformInfoHob() from OvmfPkg/PlatformPei.
QemuFwCfgLib expect this HOB to be present, or fails to do anything.
InternalQemuFwCfgIsAvailable() from QemuFwCfgPeiLib module will not
check if the HOB is actually present for example and try to use a NULL
pointer.
Fixes: cda98df16228970dcf9a4ce2af5368219711b4b0 ("OvmfPkg/QemuFwCfgLib: remove
mQemuFwCfgSupported + mQemuFwCfgDmaSupported")
Signed-off-by: Corvin Köhne <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Jiewen Yao <[email protected]>
Cc: Jordan Justen <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Rebecca Cran <[email protected]>
Cc: Peter Grehan <[email protected]>
---
OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf | 1 +
OvmfPkg/Bhyve/PlatformPei/Platform.c | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf
b/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf
index 739d63098b1e..07570d4e30ca 100644
--- a/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf
@@ -44,6 +44,7 @@ [Packages]
[Guids]
gEfiMemoryTypeInformationGuid
+ gUefiOvmfPkgPlatformInfoGuid
[LibraryClasses]
BaseLib
diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c
b/OvmfPkg/Bhyve/PlatformPei/Platform.c
index 5bfe435327c1..bdfc1614d284 100644
--- a/OvmfPkg/Bhyve/PlatformPei/Platform.c
+++ b/OvmfPkg/Bhyve/PlatformPei/Platform.c
@@ -17,6 +17,7 @@
//
// The Library classes this module consumes
//
+#include <Library/BaseMemoryLib.h>
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/HobLib.h>
@@ -27,6 +28,7 @@
#include <Library/PciLib.h>
#include <Library/PeimEntryPoint.h>
#include <Library/PeiServicesLib.h>
+#include <Library/PlatformInitLib.h>
#include <Library/ResourcePublicationLib.h>
#include <Guid/MemoryTypeInformation.h>
#include <Ppi/MasterBootMode.h>
@@ -534,6 +536,23 @@ MaxCpuCountInitialization (
));
}
+/**
+ * @brief Builds PlatformInfo Hob
+ */
+EFI_HOB_PLATFORM_INFO *
+BuildPlatformInfoHob (
+ VOID
+ )
+{
+ EFI_HOB_PLATFORM_INFO PlatformInfoHob;
+ EFI_HOB_GUID_TYPE *GuidHob;
+
+ ZeroMem (&PlatformInfoHob, sizeof PlatformInfoHob);
+ BuildGuidDataHob (&gUefiOvmfPkgPlatformInfoGuid, &PlatformInfoHob, sizeof
(EFI_HOB_PLATFORM_INFO));
+ GuidHob = GetFirstGuidHob (&gUefiOvmfPkgPlatformInfoGuid);
+ return (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob);
+}
+
/**
Perform Platform PEI initialization.
@@ -551,6 +570,7 @@ InitializePlatform (
)
{
DEBUG ((DEBUG_INFO, "Platform PEIM Loaded\n"));
+ BuildPlatformInfoHob();
//
// Initialize Local APIC Timer hardware and disable Local APIC Timer
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107170): https://edk2.groups.io/g/devel/message/107170
Mute This Topic: https://groups.io/mt/100327419/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
