From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by mx.groups.io with SMTP id smtpd.web10.55772.1606714483749664404 for ; Sun, 29 Nov 2020 21:34:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@bsdio.com header.s=xmission header.b=eM1+e0ex; spf=none, err=SPF record not found (domain: bsdio.com, ip: 166.70.13.231, mailfrom: rebecca@bsdio.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=bsdio.com; s=xmission; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=OkKvShkz3msQSUYtqBxDOQm3B1/kvx1psE4+8EcgsOU=; b=eM1+e0exEIaaCZFGIj/GoFda5h Me93fuoFc7x3v6imX5yw8t4mms5sQ/KnToQPynljNczk7zxL2lDK7C8f1jMw+jRYAZQpdMKUBFzpe uCaPplKkFg6heoMmNzgRSHe+qXxmVvVGRV5rrp8NpIPvlUdqR3O6v7blNwkKupZVA2GU=; Received: from in02.mta.xmission.com ([166.70.13.52]) by out01.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbpi-003pfZ-W4; Sun, 29 Nov 2020 22:34:43 -0700 Received: from mta5.zcs.xmission.com ([166.70.13.69]) by in02.mta.xmission.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kjbph-000oEk-JB; Sun, 29 Nov 2020 22:34:42 -0700 Received: from localhost (localhost [127.0.0.1]) by mta5.zcs.xmission.com (Postfix) with ESMTP id 763A712807AE; Sun, 29 Nov 2020 22:34:41 -0700 (MST) X-Amavis-Modified: Mail body modified (using disclaimer) - mta5.zcs.xmission.com Received: from mta5.zcs.xmission.com ([127.0.0.1]) by localhost (mta5.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id owg44pU66lpr; Sun, 29 Nov 2020 22:34:41 -0700 (MST) Received: from localhost.localdomain (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta5.zcs.xmission.com (Postfix) with ESMTPSA id 37B24128077E; Sun, 29 Nov 2020 22:34:41 -0700 (MST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Peter Grehan Date: Sun, 29 Nov 2020 22:34:12 -0700 Message-Id: <20201130053412.2-6-rebecca@bsdio.com> X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: <20201130053412.2-1-rebecca@bsdio.com> References: <20201130053412.2-1-rebecca@bsdio.com> MIME-Version: 1.0 X-XM-SPF: eid=1kjbph-000oEk-JB;;;mid=<20201130053412.2-6-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.69;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.69 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa07.xmission.com X-Spam-Level: *** X-Spam-Status: No, score=3.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,LotsOfNums_01,TM2_M_VERY_LONG_WORD,XMNoVowels autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * 1.5 XMNoVowels Alpha-numberic number with no vowels * 1.2 LotsOfNums_01 BODY: Lots of long strings of numbers * 1.0 TM2_M_VERY_LONG_WORD BODY: Very long word (longer than 40 * chars) * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa07 1397; IP=ok Body=1 Fuz1=1] X-Spam-DCC: XMission; sa07 1397; IP=ok Body=1 Fuz1=1 X-Spam-Combo: ***;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 841 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 12 (1.4%), b_tie_ro: 10 (1.2%), parse: 1.96 (0.2%), extract_message_metadata: 19 (2.3%), get_uri_detail_list: 7 (0.8%), tests_pri_-1000: 15 (1.7%), tests_pri_-950: 1.24 (0.1%), tests_pri_-900: 1.01 (0.1%), tests_pri_-90: 126 (15.0%), check_bayes: 123 (14.6%), b_tokenize: 37 (4.4%), b_tok_get_all: 16 (2.0%), b_comp_prob: 4.5 (0.5%), b_tok_touch_all: 61 (7.3%), b_finish: 1.69 (0.2%), tests_pri_0: 646 (76.8%), check_dkim_signature: 0.99 (0.1%), check_dkim_adsp: 2.9 (0.3%), poll_dns_idle: 0.35 (0.0%), tests_pri_10: 3.0 (0.4%), tests_pri_500: 13 (1.5%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH 5/5] OvmfPkg/Bhyve: Fix various style issues X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Content-Transfer-Encoding: 8bit Fix ordering of includes, sources, libraries etc. Remove leading/trailing underscores from include guards. Change INF and DSC version numbers to be decimal. Signed-off-by: Rebecca Cran --- OvmfPkg/Bhyve/BhyveX64.dsc | 2 +- .../Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 +++++++++--------- OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf | 10 +++++----- OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf | 8 +++----- OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf | 12 ++++++------ .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 10 +++++----- OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h | 10 +++------- OvmfPkg/Bhyve/AcpiTables/Platform.h | 2 +- OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h | 6 +++--- OvmfPkg/Bhyve/PlatformPei/Cmos.h | 6 +++--- .../SmbiosPlatformDxe/SmbiosPlatformDxe.h | 7 +++---- OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c | 3 ++- OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c | 2 +- OvmfPkg/Bhyve/PlatformPei/Fv.c | 2 +- OvmfPkg/Bhyve/PlatformPei/Platform.c | 2 +- 15 files changed, 47 insertions(+), 53 deletions(-) diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index c9813097ca32..b93fe30ae4e0 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -17,7 +17,7 @@ [Defines] PLATFORM_NAME = Bhyve PLATFORM_GUID = 562b76ee-ceb2-4f4f-adfe-a4c8dc46e4ff PLATFORM_VERSION = 0.1 - DSC_SPECIFICATION = 0x00010005 + DSC_SPECIFICATION = 1.30 OUTPUT_DIRECTORY = Build/BhyveX64 SUPPORTED_ARCHITECTURES = X64 BUILD_TARGETS = NOOPT|DEBUG|RELEASE diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf index eec5a42f41e3..595fd055f98a 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -8,7 +8,7 @@ ## [Defines] - INF_VERSION = 0x00010005 + INF_VERSION = 1.29 BASE_NAME = AcpiPlatform FILE_GUID = D5F92408-BAB5-44CA-8A60-C212F01D7E9D MODULE_TYPE = DXE_DRIVER @@ -24,9 +24,9 @@ [Defines] [Sources] AcpiPlatform.c AcpiPlatform.h + Bhyve.c EntryPoint.c PciDecoding.c - Bhyve.c [Packages] MdePkg/MdePkg.dec @@ -35,17 +35,17 @@ [Packages] UefiCpuPkg/UefiCpuPkg.dec [LibraryClasses] - UefiLib - PcdLib + BaseLib BaseMemoryLib - DebugLib - UefiBootServicesTableLib - UefiDriverEntryPoint BhyveFwCtlLib - MemoryAllocationLib - BaseLib + DebugLib DxeServicesTableLib + MemoryAllocationLib OrderedCollectionLib + PcdLib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiLib [Protocols] gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf b/OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf index 3aab42419ca7..f422793f4938 100644 --- a/OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf +++ b/OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf @@ -12,7 +12,7 @@ ## [Defines] - INF_VERSION = 0x00010005 + INF_VERSION = 1.29 BASE_NAME = PlatformAcpiTables FILE_GUID = B4BA6241-936C-4485-A483-9FA832C758CA MODULE_TYPE = USER_DEFINED @@ -25,14 +25,14 @@ [Defines] # [Sources] - Platform.h - Madt.aslc + Dsdt.asl Facp.aslc Facs.aslc - Dsdt.asl Hpet.aslc - Spcr.aslc + Madt.aslc Mcfg.aslc + Platform.h + Spcr.aslc [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf b/OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf index 5d6e41f0575a..d4016605f343 100644 --- a/OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf +++ b/OvmfPkg/Bhyve/BhyveRfbDxe/BhyveRfbDxe.inf @@ -10,7 +10,7 @@ ## [Defines] - INF_VERSION = 0x00010005 + INF_VERSION = 1.29 BASE_NAME = EmuGopDxe FILE_GUID = 1b290126-5760-424e-8aa2-3faf4d0d7978 MODULE_TYPE = UEFI_DRIVER @@ -29,12 +29,11 @@ [Defines] [Sources] ComponentName.c - GopScreen.c - GopDriver.c Gop.h + GopDriver.c + GopScreen.c VbeShim.c - [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec @@ -55,7 +54,6 @@ [LibraryClasses] UefiBootServicesTableLib UefiDriverEntryPoint - [Protocols] gEfiGraphicsOutputProtocolGuid # PROTOCOL BY_START gEfiDevicePathProtocolGuid # PROTOCOL TO_START diff --git a/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf b/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf index 7288cff4c8a3..12203e9f804d 100644 --- a/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/Bhyve/PlatformPei/PlatformPei.inf @@ -11,7 +11,7 @@ ## [Defines] - INF_VERSION = 0x00010005 + INF_VERSION = 1.29 BASE_NAME = PlatformPei FILE_GUID = aa89d903-345b-4ab2-9abf-030b5efb5d50 MODULE_TYPE = PEIM @@ -51,15 +51,15 @@ [LibraryClasses] DebugLib HobLib IoLib + LocalApicLib + MemEncryptSevLib + MtrrLib PciLib - ResourcePublicationLib + PeimEntryPoint PeiServicesLib PeiServicesTablePointerLib - PeimEntryPoint - MtrrLib - MemEncryptSevLib PcdLib - LocalApicLib + ResourcePublicationLib [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase diff --git a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index a4cc6e7a565c..12deae7825e6 100644 --- a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -10,7 +10,7 @@ ## [Defines] - INF_VERSION = 0x00010005 + INF_VERSION = 1.29 BASE_NAME = SmbiosPlatformDxe FILE_GUID = e2d8a63c-c239-484f-bb21-2917843cc382 MODULE_TYPE = DXE_DRIVER @@ -25,9 +25,9 @@ [Defines] # [Sources] + Bhyve.c SmbiosPlatformDxe.h SmbiosPlatformDxe.c - Bhyve.c [Packages] MdePkg/MdePkg.dec @@ -35,14 +35,14 @@ [Packages] OvmfPkg/OvmfPkg.dec [LibraryClasses] - UefiBootServicesTableLib - BaseMemoryLib BaseLib - UefiDriverEntryPoint + BaseMemoryLib DebugLib HobLib MemoryAllocationLib PcdLib + UefiBootServicesTableLib + UefiDriverEntryPoint [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h index d30cd11a1dc9..994ee2c7cded 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h @@ -1,5 +1,5 @@ /** @file - Sample ACPI Platform Driver + bhyve ACPI Platform Driver Copyright (c) 2020, Rebecca Cran Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
@@ -11,17 +11,14 @@ #define _ACPI_PLATFORM_H_INCLUDED_ #include - #include #include #include - #include -#include #include #include +#include #include - #include typedef struct { @@ -73,5 +70,4 @@ RestorePciDecoding ( IN UINTN Count ); -#endif - +#endif /* _ACPI_PLATFORM_H_INCLUDED_ */ diff --git a/OvmfPkg/Bhyve/AcpiTables/Platform.h b/OvmfPkg/Bhyve/AcpiTables/Platform.h index fc43ab411486..c6d43041f36d 100644 --- a/OvmfPkg/Bhyve/AcpiTables/Platform.h +++ b/OvmfPkg/Bhyve/AcpiTables/Platform.h @@ -14,8 +14,8 @@ #define _Platform_h_INCLUDED_ #include -#include #include +#include // // ACPI table information used to initialize tables. diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h b/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h index d196a8e6cf93..13cf3976266c 100644 --- a/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h +++ b/OvmfPkg/Bhyve/BhyveRfbDxe/Gop.h @@ -8,8 +8,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef __UGA_H_ -#define __UGA_H_ +#ifndef _GOP_H_ +#define _GOP_H_ #include #include @@ -146,4 +146,4 @@ InstallVbeShim ( IN EFI_PHYSICAL_ADDRESS FrameBufferBase ); -#endif +#endif /* _GOP_H_ */ diff --git a/OvmfPkg/Bhyve/PlatformPei/Cmos.h b/OvmfPkg/Bhyve/PlatformPei/Cmos.h index 3cd98799a3af..ef7901fbeaa8 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Cmos.h +++ b/OvmfPkg/Bhyve/PlatformPei/Cmos.h @@ -6,8 +6,8 @@ **/ -#ifndef __CMOS_H__ -#define __CMOS_H__ +#ifndef _CMOS_H_ +#define _CMOS_H_ /** Reads 8-bits of CMOS data. @@ -46,5 +46,5 @@ CmosWrite8 ( ); -#endif +#endif /* _CMOS_H_ */ diff --git a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h index 1971827be462..12d7be7b2411 100644 --- a/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h +++ b/OvmfPkg/Bhyve/SmbiosPlatformDxe/SmbiosPlatformDxe.h @@ -13,14 +13,13 @@ #define _SMBIOS_PLATFORM_DXE_H_ #include - #include #include -#include #include #include -#include +#include #include +#include /** @@ -49,4 +48,4 @@ IsEntryPointStructureValid ( IN SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure ); -#endif +#endif /* _SMBIOS_PLATFORM_DXE_H_ */ diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c index 31bbf6c474c7..d5c78c61d5ad 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.c @@ -1,8 +1,9 @@ /** @file - OVMF ACPI Platform Driver + bhyve ACPI Platform Driver Copyright (c) 2020, Rebecca Cran Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent **/ diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c b/OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c index 6d42264b654a..01ee89474667 100644 --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/Bhyve.c @@ -9,8 +9,8 @@ #include "AcpiPlatform.h" #include -#include #include +#include STATIC EFI_STATUS diff --git a/OvmfPkg/Bhyve/PlatformPei/Fv.c b/OvmfPkg/Bhyve/PlatformPei/Fv.c index ee4ecab615f9..94b7e2141562 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Fv.c +++ b/OvmfPkg/Bhyve/PlatformPei/Fv.c @@ -10,8 +10,8 @@ #include "Platform.h" #include #include -#include #include +#include /** diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c b/OvmfPkg/Bhyve/PlatformPei/Platform.c index 9f1900626d6b..3a414ffcb738 100644 --- a/OvmfPkg/Bhyve/PlatformPei/Platform.c +++ b/OvmfPkg/Bhyve/PlatformPei/Platform.c @@ -21,13 +21,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include -- 2.29.2.windows.2