ArmVirtPkg: Rename ArmVirtQemuMonitorLib to ArmVirtMonitorLib

The implementation of ArmMonitorLib that selects the conduit (SMC or HVC) based on the PSCI FDT node is suitable for other VMMs as well, so rename it more appropriately. Signed-off-by: Ard Biesheuvel <[email protected]>
coreboot · Nov 26, 2024 · f9f4164 · f9f4164
1 parent 91171b6
commit f9f4164
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -92,7 +92,7 @@
   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
 !endif
 
-  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf
+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
 
 [LibraryClasses.AARCH64]
   ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf
@@ -102,7 +102,7 @@
 
 [LibraryClasses.common.PEIM]
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
-  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf
+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.inf
   FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
 

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -82,7 +82,7 @@
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
 
-  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf
+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   AcpiPlatformLib|OvmfPkg/Library/AcpiPlatformLib/DxeAcpiPlatformLib.inf

diff --git a/...irtQemuMonitorLib/ArmVirtQemuMonitorLib.c → ...ary/ArmVirtMonitorLib/ArmVirtMonitorLib.c b/...irtQemuMonitorLib/ArmVirtQemuMonitorLib.c → ...ary/ArmVirtMonitorLib/ArmVirtMonitorLib.c
@@ -1,6 +1,6 @@
 /** @file
   Arm Monitor Library that chooses the conduit based on the PSCI node in the
-  device tree provided by QEMU
+  device tree provided by the VMM.
 
   Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
   Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@@ -29,7 +29,7 @@ STATIC UINT32  mArmSmcccMethod;
 **/
 RETURN_STATUS
 EFIAPI
-ArmVirtQemuMonitorLibConstructor (
+ArmVirtMonitorLibConstructor (
   VOID
   )
 {

diff --git a/...tQemuMonitorLib/ArmVirtQemuMonitorLib.inf → ...y/ArmVirtMonitorLib/ArmVirtMonitorLib.inf b/...tQemuMonitorLib/ArmVirtQemuMonitorLib.inf → ...y/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
@@ -1,6 +1,6 @@
 ## @file
 #  Arm Monitor Library that chooses the conduit based on the PSCI node in the
-#  device tree provided by QEMU
+#  device tree provided by the VMM
 #
 #  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
 #  Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@@ -10,15 +10,15 @@
 
 [Defines]
   INF_VERSION                    = 1.29
-  BASE_NAME                      = ArmVirtQemuMonitorLib
+  BASE_NAME                      = ArmVirtMonitorLib
   FILE_GUID                      = 09f50ee5-2aa2-42b9-a2a0-090faeefed2b
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmMonitorLib|DXE_DRIVER DXE_RUNTIME_DRIVER
-  CONSTRUCTOR                    = ArmVirtQemuMonitorLibConstructor
+  CONSTRUCTOR                    = ArmVirtMonitorLibConstructor
 
 [Sources]
-  ArmVirtQemuMonitorLib.c
+  ArmVirtMonitorLib.c
 
 [Packages]
   ArmPkg/ArmPkg.dec

diff --git a/...uMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c → ...mVirtMonitorPeiLib/ArmVirtMonitorPeiLib.c b/...uMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c → ...mVirtMonitorPeiLib/ArmVirtMonitorPeiLib.c
@@ -1,6 +1,6 @@
 /** @file
   Arm Monitor Library that chooses the conduit based on the PSCI node in the
-  device tree provided by QEMU.
+  device tree provided by the VMM.
 
   Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
   Copyright (c) 2024, Google LLC. All rights reserved.<BR>

diff --git a/...onitorPeiLib/ArmVirtQemuMonitorPeiLib.inf → ...irtMonitorPeiLib/ArmVirtMonitorPeiLib.inf b/...onitorPeiLib/ArmVirtQemuMonitorPeiLib.inf → ...irtMonitorPeiLib/ArmVirtMonitorPeiLib.inf
@@ -1,6 +1,6 @@
 ## @file
 #  Arm Monitor Library that chooses the conduit based on the PSCI node in the
-#  device tree provided by QEMU.
+#  device tree provided by the VMM.
 #
 #  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
 #  Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@@ -10,14 +10,14 @@
 
 [Defines]
   INF_VERSION                    = 1.29
-  BASE_NAME                      = ArmVirtQemuMonitorPeiLib
+  BASE_NAME                      = ArmVirtMonitorPeiLib
   FILE_GUID                      = c610e0dc-dd7a-47c8-8fea-26c4710709ff
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmMonitorLib|PEIM
 
 [Sources]
-  ArmVirtQemuMonitorPeiLib.c
+  ArmVirtMonitorPeiLib.c
 
 [Packages]
   ArmPkg/ArmPkg.dec