From nobody Mon Feb 9 11:30:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+75676+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75676+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622060539; cv=none; d=zohomail.com; s=zohoarc; b=DkkzJ8xfnAeW8fafjeWM9Xl1dSoDCwuoL6DpWRxAMI3QnBcN5YcRhLuqVeurtz+2IPMgEP8qu7ZqMuC6QwUIlyIvMtiBxe4JWbHsuetnsewwOGxD6JmHqSLzl7bZ2XJbJIg4E8zZmzFKwyLfrPwMT2W0HcwX+kVNZ/oe57VqwEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622060539; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=gTI9mtwe+RL8V077XSgjPeL9Q7ZbCkT/Qc/wKXDVHKI=; b=UuEeSYs/I0ljkfWHIa5lT8LDswnHbwRGs7kHu3qCXHRkmcEnDxITwZY5hBzKFoiu7YiSZNpDEIbEmt+l5YcvGAOWYMMqM4JVZwXzt5K8uLiaNnItZgiluWz4mDTfx3Jn7/g1rYUyaKi6/TXsN/FcThAQLXilHLpFiMVISeolF+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+75676+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1622060539985902.8838421674525; Wed, 26 May 2021 13:22:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2P5eYY1788612xz5XsEWFob1; Wed, 26 May 2021 13:22:19 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web09.2972.1622060539002335049 for ; Wed, 26 May 2021 13:22:19 -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-175-0f9vqJgVMkiTNTZtfON5XA-1; Wed, 26 May 2021 16:22:16 -0400 X-MC-Unique: 0f9vqJgVMkiTNTZtfON5XA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 063EC802690; Wed, 26 May 2021 20:22:15 +0000 (UTC) X-Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-61.ams2.redhat.com [10.36.114.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6C5B2AE8B; Wed, 26 May 2021 20:22:13 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Jordan Justen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [edk2-devel] [PATCH 07/43] OvmfPkg/AcpiPlatformDxe: sort #includes and [LibraryClasses] Date: Wed, 26 May 2021 22:14:10 +0200 Message-Id: <20210526201446.12554-8-lersek@redhat.com> In-Reply-To: <20210526201446.12554-1-lersek@redhat.com> References: <20210526201446.12554-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: SlIPKiB39VZOBedzfNFEnpR6x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1622060539; bh=gTI9mtwe+RL8V077XSgjPeL9Q7ZbCkT/Qc/wKXDVHKI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=TZmDLscDuqTxp41T74YDqaUrdwwX002QKgcwFATv6ZrISIohtxF7pDc2UXG/p3B/kIy YZIc0cLffv4omGohduB8fmTiKdB8YQSBvCpxCzF/6QuJHl6vmAkrWvcpL6dZAKUoo7GAP HCyH0wcPsNH8itTA6Rc1+HqlgepclXH2AjI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Place all public #includes first, all module-private #includes second. Separate them with a single empty line. Keep each section sorted in itself. Sort all sections in both INF files. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Philippe Mathieu-Daud=C3=A9 Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2122 Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 +++++++++-------= -- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf | 2 +- OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h | 15 ++++++--------- OvmfPkg/AcpiPlatformDxe/EntryPoint.c | 1 + OvmfPkg/AcpiPlatformDxe/Qemu.c | 11 ++++++----- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 12 ++++++------ OvmfPkg/AcpiPlatformDxe/Xen.c | 3 ++- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlat= formDxe/AcpiPlatformDxe.inf index e486b8afa56d..4522d7f6110c 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -29,30 +29,30 @@ [Sources] Qemu.c QemuFwCfgAcpi.c QemuLoader.h Xen.c =20 [Packages] - MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec UefiCpuPkg/UefiCpuPkg.dec =20 [LibraryClasses] - UefiLib - PcdLib + BaseLib BaseMemoryLib DebugLib - UefiBootServicesTableLib - UefiDriverEntryPoint - QemuFwCfgLib - QemuFwCfgS3Lib - MemoryAllocationLib - BaseLib DxeServicesTableLib + MemoryAllocationLib OrderedCollectionLib + PcdLib + QemuFwCfgLib + QemuFwCfgS3Lib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiLib XenPlatformLib =20 [Protocols] gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiFirmwareVolume2ProtocolGuid # PROTOCOL SOMETIMES_CONSU= MED gEfiPciIoProtocolGuid # PROTOCOL SOMETIMES_CONSU= MED diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf b/OvmfPkg= /AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf index c9ec4f60bc78..cc24f35bd83a 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf @@ -27,14 +27,14 @@ [Sources] PciDecoding.c QemuFwCfgAcpi.c QemuFwCfgAcpiPlatform.c QemuLoader.h =20 [Packages] - MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec =20 [LibraryClasses] BaseLib DebugLib MemoryAllocationLib diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/AcpiPlatformD= xe/AcpiPlatform.h index c8dee8ab7a3c..511a30782f6d 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h @@ -6,25 +6,22 @@ =20 **/ =20 #ifndef ACPI_PLATFORM_H_ #define ACPI_PLATFORM_H_ =20 -#include - -#include -#include -#include - +#include #include -#include #include #include +#include #include - -#include +#include +#include +#include +#include =20 typedef struct { EFI_PCI_IO_PROTOCOL *PciIo; UINT64 PciAttributes; } ORIGINAL_ATTRIBUTES; =20 diff --git a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c b/OvmfPkg/AcpiPlatformDxe= /EntryPoint.c index f66f89291157..fb07ed85373d 100644 --- a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c +++ b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c @@ -5,12 +5,13 @@ Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent **/ =20 #include + #include "AcpiPlatform.h" =20 STATIC EFI_ACPI_TABLE_PROTOCOL * FindAcpiTableProtocol ( VOID diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.c index 7fb42270043f..bed3b16159a6 100644 --- a/OvmfPkg/AcpiPlatformDxe/Qemu.c +++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c @@ -6,20 +6,21 @@ Copyright (C) 2012-2014, Red Hat, Inc. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#include "AcpiPlatform.h" +#include #include -#include -#include #include -#include +#include #include -#include +#include +#include + +#include "AcpiPlatform.h" =20 BOOLEAN QemuDetected ( VOID ) { diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index b62027db6e66..c07b84a21385 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -5,23 +5,23 @@ Copyright (C) 2012-2014, Red Hat, Inc. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#include "AcpiPlatform.h" -#include "QemuLoader.h" +#include #include +#include #include +#include +#include #include #include -#include -#include -#include -#include =20 +#include "AcpiPlatform.h" +#include "QemuLoader.h" =20 // // The user structure for the ordered collection that will track the fw_cfg // blobs under processing. // typedef struct { diff --git a/OvmfPkg/AcpiPlatformDxe/Xen.c b/OvmfPkg/AcpiPlatformDxe/Xen.c index 289ef971c4b8..1d69989042c6 100644 --- a/OvmfPkg/AcpiPlatformDxe/Xen.c +++ b/OvmfPkg/AcpiPlatformDxe/Xen.c @@ -5,15 +5,16 @@ Copyright (c) 2012, Bei Guan =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 -#include "AcpiPlatform.h" #include =20 +#include "AcpiPlatform.h" + #define XEN_ACPI_PHYSICAL_ADDRESS 0x000EA020 #define XEN_BIOS_PHYSICAL_END 0x000FFFFF =20 EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER *XenAcpiRsdpStructurePtr =3D= NULL; =20 /** --=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 (#75676): https://edk2.groups.io/g/devel/message/75676 Mute This Topic: https://groups.io/mt/83110397/1787277 Mute #includes:https://edk2.groups.io/g/devel/mutehashtag/includes 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-