From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
 by mx.groups.io with SMTP id smtpd.web09.8367.1623854386701137998
 for <devel@edk2.groups.io>;
 Wed, 16 Jun 2021 07:39:46 -0700
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GF9Upbvy;
 spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org)
Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B3DE611CE
	for <devel@edk2.groups.io>; Wed, 16 Jun 2021 14:39:46 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1623854386;
	bh=uYUW14ejosakeCX7Nbve9ULYU8YX7Xq3DfTkFPqqWmA=;
	h=References:In-Reply-To:From:Date:Subject:To:Cc:From;
	b=GF9UpbvyBN62deSgiuDcEjulSNZVonfI7fCAT3QnLbYiBxHh9PEb8YqrPKj9iwNeS
	 RnwGQ/EylDMRt/vebGNdwI5OpKHNc6SoKwOSYvFoofHer5/PpT+1Kt6Sw3UMttqquL
	 vNsnvx1oL6+hVktAD3IermARF+OyMfLU8zw1tmnakCWAvGDtdr6kPG4aIWLpKBFXKv
	 7gh8gwYV6GNv+nL460msTHxG4rLhqNXgXY9USkPX0M5Nrq6sS2IgRAKKXCHSs01OLH
	 Cmr2g1wC6C8HwQpaeWIz+aAD6305PwDUQEkoCPH8JeO6oZ1gG97sT+IXNL8a8lplJ2
	 MKDy1+fJziSiA==
Received: by mail-oi1-f175.google.com with SMTP id w127so2731217oig.12
        for <devel@edk2.groups.io>; Wed, 16 Jun 2021 07:39:46 -0700 (PDT)
X-Gm-Message-State: AOAM533Kqb/ERPUe+FLt94PgSvwno+HneVqaKLfhmNrTHlkFth9LOiG8
	/EH/aMnd6uhmNM/6R+t7OeVjL0KMNqYdn9iLxWw=
X-Google-Smtp-Source: ABdhPJxS2ObthFl8q1nqq2vaCL5qLCFaZzrUdc2hUl0ErQCUr6o4TMzehY+QCYyhfIEckISBlYAQ466CXAIlOEoXd1w=
X-Received: by 2002:aca:5a04:: with SMTP id o4mr3349568oib.33.1623854385468;
 Wed, 16 Jun 2021 07:39:45 -0700 (PDT)
MIME-Version: 1.0
References: <20210612210749.75099-1-rebecca@bsdio.com>
In-Reply-To: <20210612210749.75099-1-rebecca@bsdio.com>
From: "Ard Biesheuvel" <ardb@kernel.org>
Date: Wed, 16 Jun 2021 16:39:34 +0200
X-Gmail-Original-Message-ID: <CAMj1kXF6N_0f2nmEea7kU+8+PyjyS13G9baYNpGw6T6CKBznpA@mail.gmail.com>
Message-ID: <CAMj1kXF6N_0f2nmEea7kU+8+PyjyS13G9baYNpGw6T6CKBznpA@mail.gmail.com>
Subject: Re: [PATCH] OvmfPkg/Bhyve: Remove Xen remnants
To: Rebecca Cran <rebecca@bsdio.com>
Cc: Peter Grehan <grehan@freebsd.org>, Laszlo Ersek <lersek@redhat.com>, 
	Ard Biesheuvel <ardb+tianocore@kernel.org>, Jordan Justen <jordan.l.justen@intel.com>, 
	edk2-devel-groups-io <devel@edk2.groups.io>
Content-Type: text/plain; charset="UTF-8"

On Sat, 12 Jun 2021 at 23:08, Rebecca Cran <rebecca@bsdio.com> wrote:
>
> Several Xen remnants were left over from adapting the Ovmf code for
> Bhyve. Remove them.
>
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>

Hi Rebecca,

This fails to apply. Is it perhaps conflicting with your TPM removal patch?

> ---
>  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;
> --
> 2.32.0
>
>