public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Ard Biesheuvel" <ardb@kernel.org>
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>
Subject: Re: [PATCH] OvmfPkg/Bhyve: Remove Xen remnants
Date: Wed, 16 Jun 2021 16:39:34 +0200	[thread overview]
Message-ID: <CAMj1kXF6N_0f2nmEea7kU+8+PyjyS13G9baYNpGw6T6CKBznpA@mail.gmail.com> (raw)
In-Reply-To: <20210612210749.75099-1-rebecca@bsdio.com>

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

  parent reply	other threads:[~2021-06-16 14:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-12 21:07 [PATCH] OvmfPkg/Bhyve: Remove Xen remnants Rebecca Cran
2021-06-12 23:20 ` Peter Grehan
2021-06-16 14:39 ` Ard Biesheuvel [this message]
2021-06-22 14:58 ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAMj1kXF6N_0f2nmEea7kU+8+PyjyS13G9baYNpGw6T6CKBznpA@mail.gmail.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox