1 files changed, 7 insertions, 1 deletions
diff --git a/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c b/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c
index 67892bcf37..7cb7f46c9b 100644
--- a/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c
+++ b/OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c
@@ -65,7 +65,13 @@ XenHypercallLibInit (
 
   GuidHob = GetFirstGuidHob (&gEfiXenInfoGuid);
   if (GuidHob == NULL) {
-    return RETURN_NOT_FOUND;
+    //
+    // We don't fail library construction, since that has catastrophic
+    // consequences for client modules (whereas those modules may easily be
+    // running on a non-Xen platform). Instead, XenHypercallIsAvailable() above
+    // will return FALSE.
+    //
+    return RETURN_SUCCESS;
   }
   XenInfo = (EFI_XEN_INFO *) GET_GUID_HOB_DATA (GuidHob);
   HyperPage = XenInfo->HyperPages;