Before introducing the SMM driver interface, clean up #include directives
and [LibraryClasses] by:
- removing what's not directly used,
- adding what's used but not spelled out,
- sorting the result.
This helps with seeing each source file's dependencies and with
determining the library classes for the SMM driver.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
---
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf | 13
++++++-------
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 16
++--------------
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c | 8 ++++----
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c | 2 +-
4 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
index 480b694..ea8413f 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
@@ -46,17 +46,16 @@ [Packages]
OvmfPkg/OvmfPkg.dec
[LibraryClasses]
- UefiBootServicesTableLib
- MemoryAllocationLib
+ BaseLib
BaseMemoryLib
- HobLib
DebugLib
- UefiRuntimeLib
+ DevicePathLib
DxeServicesTableLib
- BaseLib
- UefiDriverEntryPoint
- UefiLib
+ MemoryAllocationLib
PcdLib
+ UefiBootServicesTableLib
+ UefiDriverEntryPoint
+ UefiRuntimeLib
[Guids]
gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
index ec6bfdb..6edbeed 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
@@ -24,28 +24,16 @@
//
// The package level header files this module uses
//
-#include <PiDxe.h>
+#include <Pi/PiFirmwareVolume.h>
+
//
// The protocols, PPI and GUID defintions for this module
//
-#include <Guid/EventGroup.h>
-#include <Guid/FirmwareFileSystem2.h>
#include <Guid/SystemNvDataGuid.h>
-#include <Protocol/FirmwareVolumeBlock.h>
-#include <Protocol/DevicePath.h>
//
// The Library classes this module consumes
//
-#include <Library/UefiLib.h>
-#include <Library/UefiDriverEntryPoint.h>
#include <Library/BaseLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/UefiRuntimeLib.h>
-#include <Library/DebugLib.h>
-#include <Library/HobLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
#include <Library/PcdLib.h>
typedef struct {
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
index 0158bf9..c37aed1 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
@@ -23,19 +23,19 @@
//
// The protocols, PPI and GUID defintions for this module
//
-#include <Protocol/FirmwareVolumeBlock.h>
#include <Protocol/DevicePath.h>
+#include <Protocol/FirmwareVolumeBlock.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/DxeServicesTableLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h>
-#include <Library/DevicePathLib.h>
#include "FwBlockService.h"
#include "QemuFlash.h"
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
index 5b03046..28bcb13 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
@@ -13,8 +13,8 @@
**/
-#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
#include <Library/PcdLib.h>
#include "QemuFlash.h"
--
1.8.3.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
