From 5e9a8a6dfb152472c5d12a3940069b16c774f0fc Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 11 Nov 2020 22:31:53 -0700 Subject: [PATCH] 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 Message-Id: <20201112053153.22038-3-rebecca@bsdio.com> Acked-by: Peter Grehan Reviewed-by: Laszlo Ersek --- OvmfPkg/Bhyve/BhyveX64.dsc | 3 ++- 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]