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.web12.4722.1587490049401830422 for ; Tue, 21 Apr 2020 10:27:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jA3Cw4I/; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587490048; h=from:from:reply-to: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=wkrhLaeH+CnwfpX6FOA+WadaalkEu4mv47r+p4tavao=; b=jA3Cw4I/WZg5gs2IbVOYvjyMFPRITj7cVMr4DqAITElpTl0u9ZigP5OvsJMUor4OJ7JfBo EbEiL0SDFtR2nPML/qCDlJYcQEPa7H3R8QR7GKSSGK1gLcpEzUyIGkA0dMAzaPsWMV3Pc2 DyLr63/ZJEoaz7ts/BleoyehFgST1jU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393-qiXUTfmbNEiE6a0ZDU_LmA-1; Tue, 21 Apr 2020 13:27:19 -0400 X-MC-Unique: qiXUTfmbNEiE6a0ZDU_LmA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 799708018A1; Tue, 21 Apr 2020 17:27:18 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-115-52.ams2.redhat.com [10.36.115.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 845335C3FA; Tue, 21 Apr 2020 17:27:16 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH 5/6] OvmfPkg/ResetSystemLib: rename to BaseResetSystemLib From: "Laszlo Ersek" To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Cc: edk2-devel-groups-io , Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , Rebecca Cran Reply-To: devel@edk2.groups.io, lersek@redhat.com References: <20200417153751.7110-1-lersek@redhat.com> <20200417153751.7110-6-lersek@redhat.com> Message-ID: Date: Tue, 21 Apr 2020 19:27:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200417153751.7110-6-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Phil, On 04/17/20 17:37, Laszlo Ersek wrote: > In preparation for introducing DxeResetSystemLib, rename the current > (only) ResetSystemLib instance to BaseResetSystemLib. >=20 > In the DSC files, keep the ResetSystemLib resolution in the same > [LibraryClasses] section, but move it near the TimerLib resolution, as th= e > differences between the ResetSystemLib instances will mostly follow those > seen under OvmfPkg/Library/AcpiTimerLib. >=20 > (While OvmfXen does not use "OvmfPkg/Library/AcpiTimerLib", perform the > same movement there too, for keeping future DSC diffing simple.) >=20 > 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> BaseResetSystemL= ib.inf} | 6 +++--- > OvmfPkg/Library/ResetSystemLib/{ResetShutdown.c =3D> 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). 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.i= nf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > @@ -176,7 +177,6 @@ [LibraryClasses] > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull= .inf > !endif > =20 > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.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.i= nf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > @@ -180,7 +181,6 @@ [LibraryClasses] > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull= .inf > !endif > =20 > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.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.i= nf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > @@ -180,7 +181,6 @@ [LibraryClasses] > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull= .inf > !endif > =20 > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.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.inf > + ResetSystemLib|OvmfPkg/Library/ResetSystemLib/BaseResetSystemLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.i= nf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > @@ -169,7 +170,6 @@ [LibraryClasses] > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull= .inf > !endif > =20 > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.= inf > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.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. > # 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-1e844f98082= 0 > 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/Lib= rary/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