From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web10.357.1587492492623631704 for ; Tue, 21 Apr 2020 11:08:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Cyw+Ml2k; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587492491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QKK8hn049csbdctOmDO0MC3AN0TZMx232xzVUWi/noM=; b=Cyw+Ml2kvwpTuduw5kiHXm9MWzvpMc7e7q95BR5wYd6nafGYtqsEqHzQwoEs2y9WQmNGUQ t1DIDAGF4stXUZ4L4mXNcusAuEt/x+B1Mnqms3/FbS0cH1w3UDkoTq1NbDaWUV/fvjZdYy 7TrtyhHontq/Ih4B4R6jHNbdlYPIK4g= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-369-SzdZXeESM02cSwJmND-jDQ-1; Tue, 21 Apr 2020 14:08:05 -0400 X-MC-Unique: SzdZXeESM02cSwJmND-jDQ-1 Received: by mail-wr1-f70.google.com with SMTP id y10so2877342wrn.5 for ; Tue, 21 Apr 2020 11:08:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=dOKuH7hnMslbk64bUIqbt56rM8uj01XajflNzC0tQCY=; b=bNf/wzbn6bRkvfOBV3+SNJJraKQqPzTpqnRd+YOYGyV6fZR+05K5IIr3+2b1r68Y4I 7CFjGqMI+RY/pleEjPqhfCT1SZJyKu/pDaMujMf01My+WRFNcOBGuy4Kh1Cshts/yVGN mG+LT0TcDpFJISa8u2hix6W1exHkqnRKv2lK2jQOAfL1bsvmtkJ3h0TsNCTyhp1uV0z3 1gBxEcAUuqndWiRFrUU/4V4XXPoDnHm/SCjva5/Y/tsBmLygSsTGrOyhx+85Hr7kn+Qv t8HHkdFUA/YWwMfog5flb97W6F+R3uM+UUYQbgeGhLs+MxTj+KbMv0w0At+WWwlgmEcb w4cA== X-Gm-Message-State: AGi0Pua+AYvu9ZI41K88MCrn0TIP9Sut/b2azYznt+2xJtuTXZLkIKXF VwC3MrVZU8CPzDA4EGr7mSQspss8ZLnGcdf7NflbPF6kxA/7ASnHeNXfJxsU4vY5a4k0V6kuTqS xrDhRGkJ1/n6Jew== X-Received: by 2002:adf:e9cb:: with SMTP id l11mr24760717wrn.24.1587492484530; Tue, 21 Apr 2020 11:08:04 -0700 (PDT) X-Google-Smtp-Source: APiQypKFIL8Zdgz5oYX+iMAs7fjoIqErpVxJ8MFLkqNJ4AIzg1N+roZSgXy3r0ktum0v/ueRg9Hmkg== X-Received: by 2002:adf:e9cb:: with SMTP id l11mr24760692wrn.24.1587492484256; Tue, 21 Apr 2020 11:08:04 -0700 (PDT) Return-Path: Received: from [192.168.1.39] (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id k8sm4663258wrm.52.2020.04.21.11.08.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Apr 2020 11:08:03 -0700 (PDT) Subject: Re: [edk2-devel] [PATCH 5/6] OvmfPkg/ResetSystemLib: rename to BaseResetSystemLib To: devel@edk2.groups.io, lersek@redhat.com Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , Rebecca Cran References: <20200417153751.7110-1-lersek@redhat.com> <20200417153751.7110-6-lersek@redhat.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: <9e644d68-e7cf-312e-95a0-aada194e4de2@redhat.com> Date: Tue, 21 Apr 2020 20:08:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable On 4/21/20 7:27 PM, Laszlo Ersek wrote: > Phil, >=20 > 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 t= he >> differences between the ResetSystemLib instances will mostly follow thos= e >> 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 >> Cc: Ard Biesheuvel >> Cc: Jordan Justen >> Cc: Julien Grall >> Cc: Philippe Mathieu-Daud=C3=A9 >> Cc: Rebecca Cran >> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2675 >> Signed-off-by: Laszlo Ersek >> --- >> OvmfPkg/OvmfPkgIa32.dsc = | 2 +- >> OvmfPkg/OvmfPkgIa32X64.dsc = | 2 +- >> OvmfPkg/OvmfPkgX64.dsc = | 2 +- >> OvmfPkg/OvmfXen.dsc = | 2 +- >> OvmfPkg/Library/ResetSystemLib/{ResetSystemLib.inf =3D> BaseResetSyste= mLib.inf} | 6 +++--- >> OvmfPkg/Library/ResetSystemLib/{ResetShutdown.c =3D> BaseResetShutdown= .c} | 2 +- >> 6 files changed, 8 insertions(+), 8 deletions(-) >=20 > Do you have comments on this patch? >=20 > 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=C3=A9 >=20 > Thanks! > Laszlo >=20 >> 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/DebugAgentLibNu= ll.inf >> !endif >> =20 >> - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf >> LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLi= b.inf >> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/B= aseDebugPrintErrorLevelLib.inf >> =20 >> 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/DebugAgentLibNu= ll.inf >> !endif >> =20 >> - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf >> LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLi= b.inf >> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/B= aseDebugPrintErrorLevelLib.inf >> =20 >> 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/DebugAgentLibNu= ll.inf >> !endif >> =20 >> - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf >> LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLi= b.inf >> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/B= aseDebugPrintErrorLevelLib.inf >> =20 >> 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.in= f >> + 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/DebugAgentLibNu= ll.inf >> !endif >> =20 >> - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf >> LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLi= b.inf >> DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/B= aseDebugPrintErrorLevelLib.inf >> =20 >> 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 @@ >> =20 >> [Defines] >> INF_VERSION =3D 0x00010005 >> - BASE_NAME =3D ResetSystemLib >> + BASE_NAME =3D BaseResetSystemLib >> FILE_GUID =3D 66564872-21d4-4d2a-a68b-1e844f980= 820 >> MODULE_TYPE =3D BASE >> VERSION_STRING =3D 1.0 >> @@ -22,7 +22,7 @@ [Defines] >> # >> =20 >> [Sources] >> - ResetShutdown.c >> + BaseResetShutdown.c >> ResetSystemLib.c >> =20 >> [Packages] >> diff --git a/OvmfPkg/Library/ResetSystemLib/ResetShutdown.c b/OvmfPkg/Li= brary/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. >> =20 >> Copyright (C) 2020, Red Hat, Inc. >> Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved. >> >=20