diff options
| author | Rebecca Cran <rebecca@bsdio.com> | 2020-11-11 22:31:53 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-11-13 23:16:39 +0000 |
| commit | 5e9a8a6dfb152472c5d12a3940069b16c774f0fc (patch) | |
| tree | 814848df6fbf8f404328928ae879c324d17faa12 | |
| parent | cabd0de9f6ebb79b7e1e12f9085c3a79106fd72d (diff) | |
| download | edk2-5e9a8a6dfb152472c5d12a3940069b16c774f0fc.tar.gz edk2-5e9a8a6dfb152472c5d12a3940069b16c774f0fc.tar.bz2 edk2-5e9a8a6dfb152472c5d12a3940069b16c774f0fc.zip | |
OvmfPkg/Bhyve: fix build breakage after SEV-ES changes
Consume the SEV-ES-independent reset vector restored in the previous
patch. Use the Null instance of VmgExitLib.
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Message-Id: <20201112053153.22038-3-rebecca@bsdio.com>
Acked-by: Peter Grehan <grehan@freebsd.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
| -rw-r--r-- | OvmfPkg/Bhyve/BhyveX64.dsc | 3 | ||||
| -rw-r--r-- | OvmfPkg/Bhyve/BhyveX64.fdf | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index 16d2233d77..ba79ceef55 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -225,6 +225,7 @@ [LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+ VmgExitLib|UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.inf
[LibraryClasses.common.SEC]
!ifdef $(DEBUG_ON_SERIAL_PORT)
@@ -571,7 +572,7 @@ #
################################################################################
[Components]
- OvmfPkg/ResetVector/ResetVector.inf
+ OvmfPkg/Bhyve/ResetVector/ResetVector.inf
#
# SEC Phase modules
diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index 5d2586ae14..f4050c4934 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -117,7 +117,7 @@ READ_LOCK_STATUS = TRUE #
INF OvmfPkg/Sec/SecMain.inf
-INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf
+INF RuleOverride=RESET_VECTOR OvmfPkg/Bhyve/ResetVector/ResetVector.inf
################################################################################
[FV.PEIFV]
|