Re: [PATCH] OvmfPkg/Bhyve: Remove Xen remnants

["Peter Grehan" <grehan@freebsd.org>]

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 <rebecca@bsdio.com>
> ---
>   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 <Library/DebugLib.h>
>   #include <Library/PcdLib.h>
>   #include <Library/UefiBootServicesTableLib.h>
> -#include <Library/XenPlatformLib.h>
>   #include <IndustryStandard/Acpi.h>
>   
>   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 <grehan@freebsd.org>