From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from vito-vars.onthenet.com.au (vito-vars.onthenet.com.au [203.13.68.24]) by mx.groups.io with SMTP id smtpd.web08.11644.1623540032863915333 for ; Sat, 12 Jun 2021 16:20:33 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: iredmail.onthenet.com.au, ip: 203.13.68.24, mailfrom: srs0=jak5=lg=freebsd.org=grehan@iredmail.onthenet.com.au) Received: from alto.onthenet.com.au (alto.OntheNet.com.au [203.13.68.12]) by vito-vars.onthenet.com.au (Postfix) with ESMTPS id 0442920C70B8 for ; Sun, 13 Jun 2021 09:20:30 +1000 (AEST) Received: from iredmail.onthenet.com.au (iredmail.onthenet.com.au [203.13.68.150]) by alto.onthenet.com.au (Postfix) with ESMTPS id DE050209C044 for ; Sun, 13 Jun 2021 09:20:29 +1000 (AEST) Received: from iredmail.onthenet.com.au (iredmail.onthenet.com.au [127.0.0.1]) by iredmail.onthenet.com.au (Postfix) with ESMTP id D31F120E4676 for ; Sun, 13 Jun 2021 09:20:29 +1000 (AEST) Received: from iredmail.onthenet.com.au ([127.0.0.1]) by iredmail.onthenet.com.au (iredmail.onthenet.com.au [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mPh1XzablDRt for ; Sun, 13 Jun 2021 09:20:29 +1000 (AEST) Received: from MacBook-Air-4.local (unknown [120.29.45.116]) by iredmail.onthenet.com.au (Postfix) with ESMTPSA id EA79F20E4675; Sun, 13 Jun 2021 09:20:28 +1000 (AEST) Subject: Re: [PATCH] OvmfPkg/Bhyve: Remove Xen remnants To: Rebecca Cran , devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel References: <20210612210749.75099-1-rebecca@bsdio.com> From: "Peter Grehan" Message-ID: <1f8523ee-7567-e3a0-2019-b6354f0bc380@freebsd.org> Date: Sun, 13 Jun 2021 09:20:28 +1000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210612210749.75099-1-rebecca@bsdio.com> X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=BZdDLol2 c=1 sm=1 tr=0 a=A6CF0fG5TOl4vs6YHvqXgw==:117 a=ldEhusXJV03aO3JGOzKlIw==:17 a=IkcTkHD0fZMA:10 a=r6YtysWOX24A:10 a=ri_5JkV0AAAA:8 a=6I5d2MoRAAAA:8 a=uVVn7dR0UtSOKBGsJjcA:9 a=QEXdDO2ut3YA:10 a=4Qv8XOUJw1QQJyBSU6iG:22 a=IjZwj45LgO3ly-622nXo:22 X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=B/4iLNlM c=1 sm=1 tr=0 a=mJOSnoNX3k71adV6TmU0eQ==:117 a=ldEhusXJV03aO3JGOzKlIw==:17 a=IkcTkHD0fZMA:10 a=r6YtysWOX24A:10 a=ri_5JkV0AAAA:8 a=6I5d2MoRAAAA:8 a=uVVn7dR0UtSOKBGsJjcA:9 a=QEXdDO2ut3YA:10 a=4Qv8XOUJw1QQJyBSU6iG:22 a=IjZwj45LgO3ly-622nXo:22 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 6/13/21 7:07 AM, Rebecca Cran wrote: > Several Xen remnants were left over from adapting the Ovmf code for > Bhyve. Remove them. > > Signed-off-by: Rebecca Cran > --- > OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h | 7 ------- > OvmfPkg/Bhyve/BhyveX64.dsc | 1 - > OvmfPkg/Bhyve/PlatformPei/Platform.h | 17 ----------------- > 3 files changed, 25 deletions(-) > > diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h > index 994ee2c7cd..87c9bdafba 100644 > --- a/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h > +++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/AcpiPlatform.h > @@ -18,7 +18,6 @@ > #include > #include > #include > -#include > #include > > typedef struct { > @@ -46,12 +45,6 @@ BhyveInstallAcpiTable( > OUT UINTN *TableKey > ); > > -EFI_STATUS > -EFIAPI > -InstallXenTables ( > - IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol > - ); > - > EFI_STATUS > EFIAPI > InstallAcpiTables ( > diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc > index d8792812ab..25420d8261 100644 > --- a/OvmfPkg/Bhyve/BhyveX64.dsc > +++ b/OvmfPkg/Bhyve/BhyveX64.dsc > @@ -219,7 +219,6 @@ > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf > - XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf > > > !if $(TPM_ENABLE) == TRUE > diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.h b/OvmfPkg/Bhyve/PlatformPei/Platform.h > index 8239ca05ac..e0327202a5 100644 > --- a/OvmfPkg/Bhyve/PlatformPei/Platform.h > +++ b/OvmfPkg/Bhyve/PlatformPei/Platform.h > @@ -98,28 +98,11 @@ InstallClearCacheCallback ( > VOID > ); > > -EFI_STATUS > -InitializeXen ( > - VOID > - ); > - > -BOOLEAN > -XenDetect ( > - VOID > - ); > - > VOID > AmdSevInitialize ( > VOID > ); > > -extern BOOLEAN mXen; > - > -VOID > -XenPublishRamRegions ( > - VOID > - ); > - > extern EFI_BOOT_MODE mBootMode; > > extern BOOLEAN mS3Supported; > Reviewed-by: Peter Grehan