From nobody Sat Feb 7 05:01:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57520+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57520+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1587137892; cv=none; d=zohomail.com; s=zohoarc; b=bvLi3ZG55rpbG0esbETrPWNYSP2GKoDxC4Pc6Luj+6ZDlgYbmgojDZEx8mMAsml/erUAMj5FEUboXBYPUKykKXNoKjefRflONEAh9v/CTyu4QOBvmdlvEwTRXp2CDFc/OHqUOF21ZS/0TVbwzzpR0AgIv3sOgxASzowWB4PKpjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587137892; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=wA5J6HdgCnE9iKX/oEo76HF+xr+vHEhjwzBWrOJt/9c=; b=Gi3h4Rk+e6M8VcGQZrczBb5/ijLIjusYVKX35qRKcN5BU5Cc0/58Hos6xp+jzDj7ZBs6zO1gDLzrNJ5D/WLgFeTQXd0gad/sAWanmyHRUYvvQtakPLDopOwO4O61L/O/Gj7czaY61jw6LOOjjXF23T4xSK2p4EemWbUNRxm8Kq8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57520+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587137892402418.62589293593317; Fri, 17 Apr 2020 08:38:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8RhgYY1788612xpnqz2SWy2j; Fri, 17 Apr 2020 08:38:12 -0700 X-Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.61]) by mx.groups.io with SMTP id smtpd.web12.3739.1587137891392131518 for ; Fri, 17 Apr 2020 08:38:11 -0700 X-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-364-1_n0g1rTOCKAEvgbg1fz-A-1; Fri, 17 Apr 2020 11:38:06 -0400 X-MC-Unique: 1_n0g1rTOCKAEvgbg1fz-A-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 758CB8010CA; Fri, 17 Apr 2020 15:38:05 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-253.ams2.redhat.com [10.36.113.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id C212D6EF91; Fri, 17 Apr 2020 15:38:03 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Anthony Perard , Ard Biesheuvel , Jordan Justen , Julien Grall , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Rebecca Cran Subject: [edk2-devel] [PATCH 5/6] OvmfPkg/ResetSystemLib: rename to BaseResetSystemLib Date: Fri, 17 Apr 2020 17:37:50 +0200 Message-Id: <20200417153751.7110-6-lersek@redhat.com> In-Reply-To: <20200417153751.7110-1-lersek@redhat.com> References: <20200417153751.7110-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com X-Gm-Message-State: 2mBRwIto1hRUbQIhJoLeFeH5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587137892; bh=wA5J6HdgCnE9iKX/oEo76HF+xr+vHEhjwzBWrOJt/9c=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=RJ7OdHt7bAc+8SZMsP+IAMq5vDBjOBjtxQCxU1rL26A+ZecTS201Xlsa1jlQTBU0nte IDvLZhOmD3H1fNGjunMBj+h95HkM98lmDNqDd1bXnyMfYxTs+mdAHwrGIy+TY/p8EpJMI 9CDDW/I9JJ8i+Z4co/+qRmeXGC4G0gb2dOE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- OvmfPkg/OvmfPkgIa32.dsc = | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc = | 2 +- OvmfPkg/OvmfPkgX64.dsc = | 2 +- OvmfPkg/OvmfXen.dsc = | 2 +- OvmfPkg/Library/ResetSystemLib/{ResetSystemLib.inf =3D> BaseResetSystemLib= .inf} | 6 +++--- OvmfPkg/Library/ResetSystemLib/{ResetShutdown.c =3D> BaseResetShutdown.c} = | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) 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.i= nf !endif =20 - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.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/DebugAgentLibNull.i= nf !endif =20 - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.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/DebugAgentLibNull.i= nf !endif =20 - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.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.inf BaseLib|MdePkg/Library/BaseLib/BaseLib.inf @@ -169,7 +170,6 @@ [LibraryClasses] DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.i= nf !endif =20 - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf =20 diff --git a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf b/OvmfPkg/Li= brary/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-1e844f980820 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/Libra= ry/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 2.19.1.3.g30247aa5d201 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57520): https://edk2.groups.io/g/devel/message/57520 Mute This Topic: https://groups.io/mt/73085508/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-