tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2024-11-15 11:15:17 +01:00 committed by mergify[bot]
parent 91171b6b94
commit f9f4164af9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArmVirtPkg/ArmVirtQemu.dsc
View File

@ -92,7 +92,7 @@
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
!endif !endif
ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
[LibraryClasses.AARCH64] [LibraryClasses.AARCH64]
ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf
@ -102,7 +102,7 @@
[LibraryClasses.common.PEIM] [LibraryClasses.common.PEIM]
ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.inf
FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf

2
ArmVirtPkg/ArmVirtQemuKernel.dsc
View File

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

4
ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.c → ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.c
View File

@ -1,6 +1,6 @@
/** @file /** @file
Arm Monitor Library that chooses the conduit based on the PSCI node in the 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) 2022, Arm Limited. All rights reserved.<BR>
Copyright (c) 2024, Google LLC. All rights reserved.<BR> Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@ -29,7 +29,7 @@ STATIC UINT32 mArmSmcccMethod;
**/ **/
RETURN_STATUS RETURN_STATUS
EFIAPI EFIAPI
ArmVirtQemuMonitorLibConstructor ( ArmVirtMonitorLibConstructor (
VOID VOID
) )
{ {

8
ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf → ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
View File

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

2
ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c → ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.c
View File

@ -1,6 +1,6 @@
/** @file /** @file
Arm Monitor Library that chooses the conduit based on the PSCI node in the 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) 2022, Arm Limited. All rights reserved.<BR>
Copyright (c) 2024, Google LLC. All rights reserved.<BR> Copyright (c) 2024, Google LLC. All rights reserved.<BR>

6
ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf → ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.inf
View File

@ -1,6 +1,6 @@
## @file ## @file
# Arm Monitor Library that chooses the conduit based on the PSCI node in the # 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) 2022, Arm Limited. All rights reserved.<BR>
# Copyright (c) 2024, Google LLC. All rights reserved.<BR> # Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@ -10,14 +10,14 @@
[Defines] [Defines]
INF_VERSION = 1.29 INF_VERSION = 1.29
BASE_NAME = ArmVirtQemuMonitorPeiLib BASE_NAME = ArmVirtMonitorPeiLib
FILE_GUID = c610e0dc-dd7a-47c8-8fea-26c4710709ff FILE_GUID = c610e0dc-dd7a-47c8-8fea-26c4710709ff
MODULE_TYPE = BASE MODULE_TYPE = BASE
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = ArmMonitorLib|PEIM LIBRARY_CLASS = ArmMonitorLib|PEIM
[Sources] [Sources]
ArmVirtQemuMonitorPeiLib.c ArmVirtMonitorPeiLib.c
[Packages] [Packages]
ArmPkg/ArmPkg.dec ArmPkg/ArmPkg.dec