[edk2-devel] [PATCH 5/6] OvmfPkg/ResetSystemLib: rename to BaseResetSystemLib

Philippe Mathieu-Daudé philmd at redhat.com
Tue Apr 21 18:08:02 UTC 2020 

On 4/21/20 7:27 PM, Laszlo Ersek wrote:
> Phil,
> 
> On 04/17/20 17:37, Laszlo Ersek wrote:
>> In preparation for introducing DxeResetSystemLib, rename the current
>> (only) ResetSystemLib instance to BaseResetSystemLib.
>>
>> In the DSC files, keep the ResetSystemLib resolution in the same
>> [LibraryClasses] section, but move it near the TimerLib resolution, as the
>> differences between the ResetSystemLib instances will mostly follow those
>> seen under OvmfPkg/Library/AcpiTimerLib.
>>
>> (While OvmfXen does not use "OvmfPkg/Library/AcpiTimerLib", perform the
>> same movement there too, for keeping future DSC diffing simple.)
>>
>> Cc: Anthony Perard <anthony.perard at citrix.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel at arm.com>
>> Cc: Jordan Justen <jordan.l.justen at intel.com>
>> Cc: Julien Grall <julien at xen.org>
>> Cc: Philippe Mathieu-Daudé <philmd at redhat.com>
>> Cc: Rebecca Cran <rebecca at bsdio.com>
>> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2675
>> Signed-off-by: Laszlo Ersek <lersek at redhat.com>
>> ---
>>   OvmfPkg/OvmfPkgIa32.dsc                                                       | 2 +-
>>   OvmfPkg/OvmfPkgIa32X64.dsc                                                    | 2 +-
>>   OvmfPkg/OvmfPkgX64.dsc                                                        | 2 +-
>>   OvmfPkg/OvmfXen.dsc                                                           | 2 +-
>>   OvmfPkg/Library/ResetSystemLib/{ResetSystemLib.inf => BaseResetSystemLib.inf} | 6 +++---
>>   OvmfPkg/Library/ResetSystemLib/{ResetShutdown.c => BaseResetShutdown.c}       | 2 +-
>>   6 files changed, 8 insertions(+), 8 deletions(-)
> 
> Do you have comments on this patch?
> 
> If not, I think I can go ahead and merge the series (moving part of the
> last patch's commit message over to the bugzilla ticket).

No comment!

Reviewed-by: Philippe Mathieu-Daudé <philmd at redhat.com>

> 
> Thanks!
> Laszlo
> 
>> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
>> index cbc5f0e583bc..cd0ed34e0e5a 100644
>> --- a/OvmfPkg/OvmfPkgIa32.dsc
>> +++ b/OvmfPkg/OvmfPkgIa32.dsc
>> @@ -114,6 +114,7 @@ [SkuIds]
>>   [LibraryClasses]
>>     PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>>     TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
>> +  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
>>     PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>>     BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
>>     BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
>> @@ -176,7 +177,6 @@ [LibraryClasses]
>>     DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
>>   !endif
>>   
>> -  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf
>>     LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
>>     DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
>>   
>> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
>> index 6d69cc6cb56f..3c377c6e858e 100644
>> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
>> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
>> @@ -118,6 +118,7 @@ [SkuIds]
>>   [LibraryClasses]
>>     PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>>     TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
>> +  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
>>     PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>>     BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
>>     BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
>> @@ -180,7 +181,6 @@ [LibraryClasses]
>>     DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
>>   !endif
>>   
>> -  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf
>>     LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
>>     DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
>>   
>> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
>> index 5ad4f461ce52..701a7ccea987 100644
>> --- a/OvmfPkg/OvmfPkgX64.dsc
>> +++ b/OvmfPkg/OvmfPkgX64.dsc
>> @@ -118,6 +118,7 @@ [SkuIds]
>>   [LibraryClasses]
>>     PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>>     TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
>> +  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
>>     PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>>     BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
>>     BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
>> @@ -180,7 +181,6 @@ [LibraryClasses]
>>     DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
>>   !endif
>>   
>> -  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf
>>     LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
>>     DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
>>   
>> diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
>> index 47ee8db8b884..86b24d1716b9 100644
>> --- a/OvmfPkg/OvmfXen.dsc
>> +++ b/OvmfPkg/OvmfXen.dsc
>> @@ -110,6 +110,7 @@ [SkuIds]
>>   [LibraryClasses]
>>     PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
>>     TimerLib|MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
>> +  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
>>     PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>>     BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
>>     BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
>> @@ -169,7 +170,6 @@ [LibraryClasses]
>>     DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
>>   !endif
>>   
>> -  ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf
>>     LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
>>     DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
>>   
>> diff --git a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
>> similarity index 80%
>> rename from OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf
>> rename to OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
>> index 9362f884f124..0772780b2dc2 100644
>> --- a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf
>> +++ b/OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf
>> @@ -1,5 +1,5 @@
>>   ## @file
>> -#  Library instance for ResetSystem library class for OVMF
>> +#  Base library instance for ResetSystem library class for OVMF
>>   #
>>   #  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
>>   #  SPDX-License-Identifier: BSD-2-Clause-Patent
>> @@ -8,7 +8,7 @@
>>   
>>   [Defines]
>>     INF_VERSION                    = 0x00010005
>> -  BASE_NAME                      = ResetSystemLib
>> +  BASE_NAME                      = BaseResetSystemLib
>>     FILE_GUID                      = 66564872-21d4-4d2a-a68b-1e844f980820
>>     MODULE_TYPE                    = BASE
>>     VERSION_STRING                 = 1.0
>> @@ -22,7 +22,7 @@ [Defines]
>>   #
>>   
>>   [Sources]
>> -  ResetShutdown.c
>> +  BaseResetShutdown.c
>>     ResetSystemLib.c
>>   
>>   [Packages]
>> diff --git a/OvmfPkg/Library/ResetSystemLib/ResetShutdown.c b/OvmfPkg/Library/ResetSystemLib/BaseResetShutdown.c
>> similarity index 91%
>> rename from OvmfPkg/Library/ResetSystemLib/ResetShutdown.c
>> rename to OvmfPkg/Library/ResetSystemLib/BaseResetShutdown.c
>> index 971d94fa5766..21c80e43230c 100644
>> --- a/OvmfPkg/Library/ResetSystemLib/ResetShutdown.c
>> +++ b/OvmfPkg/Library/ResetSystemLib/BaseResetShutdown.c
>> @@ -1,5 +1,5 @@
>>   /** @file
>> -  Reset System Library Shutdown API implementation for OVMF.
>> +  Base Reset System Library Shutdown API implementation for OVMF.
>>   
>>     Copyright (C) 2020, Red Hat, Inc.
>>     Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
>>
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57757): https://edk2.groups.io/g/devel/message/57757
Mute This Topic: https://groups.io/mt/73085508/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

More information about the edk2-devel-archive mailing list