From 48b3ff047929aa5bd4f94128c9a3ac04d6b3b31b Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 3 Mar 2015 08:13:40 +0000 Subject: OvmfPkg: replace strict XenHypercallLib construction with explicit query XenHypercallLib has two clients at the moment: XenBusDxe and XenConsoleSerialPortLib. Currently, when XenBusDxe starts on a non-Xen X86 platform (ie. as part of OVMF not running on Xen), the X86XenHypercallLib instance built into it fails to initialize, which triggers an ASSERT() in auto-generated code. Instead, let's call XenHypercallIsAvailable() in the driver's entry point, and exit cleanly when the driver is started on a non-Xen platform. Modify the constructor of XenConsoleSerialPortLib similarly; we shouldn't proceed if Xen is not available. In practice this check should never fail, because XenConsoleSerialPortLib is only used on ARM, and ArmXenHypercallLib is always available; but nonetheless we should be pedantic. Reported-by: Gabriel L. Somlo Suggested-by: Jordan Justen Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen Reviewed-by: Ard Biesheuvel Tested-by: Ard Biesheuvel git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17001 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/XenBusDxe/XenBusDxe.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'OvmfPkg/XenBusDxe') diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.c b/OvmfPkg/XenBusDxe/XenBusDxe.c index 2c4a08673c..439b060ddc 100644 --- a/OvmfPkg/XenBusDxe/XenBusDxe.c +++ b/OvmfPkg/XenBusDxe/XenBusDxe.c @@ -165,6 +165,7 @@ XenBusDxeUnload ( @param SystemTable A pointer to the EFI System Table. @retval EFI_SUCCESS The operation completed successfully. + @retval EFI_ABORTED Xen hypercalls are not available. @retval Others An unexpected error occurred. **/ EFI_STATUS @@ -176,6 +177,10 @@ XenBusDxeDriverEntryPoint ( { EFI_STATUS Status; + if (! XenHypercallIsAvailable ()) { + return EFI_ABORTED; + } + // // Install UEFI Driver Model protocol(s). // -- cgit v1.2.3