summaryrefslogtreecommitdiffstats
path: root/OvmfPkg/SmbiosPlatformDxe
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2021-05-26 22:14:39 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-06-04 16:01:50 +0000
commit7e25086a0076fcf2bc2cbef01995f034215c209f (patch)
treee51397d2127b44526216dd9dca49a2254800b5f2 /OvmfPkg/SmbiosPlatformDxe
parent8af38170b5c96cff63ee653fe38038466d2c7293 (diff)
downloadedk2-7e25086a0076fcf2bc2cbef01995f034215c209f.tar.gz
edk2-7e25086a0076fcf2bc2cbef01995f034215c209f.tar.bz2
edk2-7e25086a0076fcf2bc2cbef01995f034215c209f.zip
OvmfPkg/SmbiosPlatformDxe: clean up #includes and INF
- Sort all sections in the INF file. - Remove unused packages (MdeModulePkg) and lib classes (BaseMemoryLib) from the INF file. - Restrict some lib classes (BaseLib, HobLib) and GUIDs (gEfiXenInfoGuid) to IA32 and X64, in the INF file; only the IA32/X64 Xen implementation requires these. - Don't make "SmbiosPlatformDxe.h" #include everything just as a convenience. Spell out directly needed #includes in every file (annotate each with an example identifier consumed), drop unused #includes. - Keep #includes sorted. - Remove the leading underscore from the #include guard macro name in "SmbiosPlatformDxe.h". Cc: Anthony Perard <anthony.perard@citrix.com> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Julien Grall <julien@xen.org> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20210526201446.12554-37-lersek@redhat.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'OvmfPkg/SmbiosPlatformDxe')
-rw-r--r--OvmfPkg/SmbiosPlatformDxe/Qemu.c8
-rw-r--r--OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c6
-rw-r--r--OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h15
-rw-r--r--OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf20
-rw-r--r--OvmfPkg/SmbiosPlatformDxe/X86Xen.c6
5 files changed, 28 insertions, 27 deletions
diff --git a/OvmfPkg/SmbiosPlatformDxe/Qemu.c b/OvmfPkg/SmbiosPlatformDxe/Qemu.c
index e346582381..fcfc3e33c2 100644
--- a/OvmfPkg/SmbiosPlatformDxe/Qemu.c
+++ b/OvmfPkg/SmbiosPlatformDxe/Qemu.c
@@ -6,10 +6,12 @@
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
+#include <Library/DebugLib.h> // ASSERT_EFI_ERROR()
+#include <Library/MemoryAllocationLib.h> // AllocatePool()
+#include <Library/PcdLib.h> // PcdGetBool()
+#include <Library/QemuFwCfgLib.h> // QemuFwCfgFindFile()
+
#include "SmbiosPlatformDxe.h"
-#include <Library/QemuFwCfgLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/PcdLib.h>
/**
Locates and extracts the QEMU SMBIOS data if present in fw_cfg
diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 7991a19dc9..9bfc9f14f1 100644
--- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -8,6 +8,12 @@
**/
+#include <IndustryStandard/SmBios.h> // SMBIOS_TABLE_TYPE0
+#include <Library/DebugLib.h> // ASSERT_EFI_ERROR()
+#include <Library/MemoryAllocationLib.h> // FreePool()
+#include <Library/UefiBootServicesTableLib.h> // gBS
+#include <Protocol/Smbios.h> // EFI_SMBIOS_PROTOCOL
+
#include "SmbiosPlatformDxe.h"
#define TYPE0_STRINGS \
diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index 21aa916d77..ad42a32641 100644
--- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -8,19 +8,10 @@
**/
-#ifndef _SMBIOS_PLATFORM_DXE_H_
-#define _SMBIOS_PLATFORM_DXE_H_
-
-#include <PiDxe.h>
-
-#include <Protocol/Smbios.h>
-#include <IndustryStandard/SmBios.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/MemoryAllocationLib.h>
+#ifndef SMBIOS_PLATFORM_DXE_H_
+#define SMBIOS_PLATFORM_DXE_H_
+#include <IndustryStandard/SmBios.h> // SMBIOS_TABLE_ENTRY_POINT
/**
Locates the Xen SMBIOS data if it exists
diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 8b56d90cf8..6063c0c9f6 100644
--- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -24,9 +24,9 @@
#
[Sources]
- SmbiosPlatformDxe.h
- SmbiosPlatformDxe.c
Qemu.c
+ SmbiosPlatformDxe.c
+ SmbiosPlatformDxe.h
[Sources.IA32, Sources.X64]
X86Xen.c
@@ -36,19 +36,19 @@
[Packages]
MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
OvmfPkg/OvmfPkg.dec
[LibraryClasses]
- UefiBootServicesTableLib
- BaseMemoryLib
- BaseLib
- UefiDriverEntryPoint
DebugLib
- HobLib
- QemuFwCfgLib
MemoryAllocationLib
PcdLib
+ QemuFwCfgLib
+ UefiBootServicesTableLib
+ UefiDriverEntryPoint
+
+[LibraryClasses.IA32, LibraryClasses.X64]
+ BaseLib
+ HobLib
[Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated
@@ -56,7 +56,7 @@
[Protocols]
gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
-[Guids]
+[Guids.IA32, Guids.X64]
gEfiXenInfoGuid
[Depex]
diff --git a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c
index bead810efd..e0b1b29f80 100644
--- a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c
+++ b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c
@@ -8,9 +8,11 @@
**/
+#include <Library/BaseLib.h> // AsciiStrnCmp()
+#include <Library/HobLib.h> // GetFirstGuidHob()
+#include <Pi/PiHob.h> // EFI_HOB_GUID_TYPE
+
#include "SmbiosPlatformDxe.h"
-#include <Library/HobLib.h>
-#include <Guid/XenInfo.h>
#define XEN_SMBIOS_PHYSICAL_ADDRESS 0x000EB000
#define XEN_SMBIOS_PHYSICAL_END 0x000F0000