OvmfPkg/PlatformPei: Hide Xen Leaf details

[mirror_edk2.git] / OvmfPkg / PlatformPei / Xen.c

diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
index 0f75fa798320a4bdd8a81c38ca31d63e5678a1e3..da3133bb9b7aa16625e2694e14bcc81ab0d9da34 100644 (file)
--- a/OvmfPkg/PlatformPei/Xen.c
+++ b/OvmfPkg/PlatformPei/Xen.c
@@ -33,6 +33,8 @@
 \r
 BOOLEAN mXen = FALSE;\r
 \r
+STATIC UINT32 mXenLeaf = 0;\r
+\r
 EFI_XEN_INFO mXenInfo;\r
 \r
 /**\r
@@ -114,31 +116,37 @@ XenConnect (
 /**\r
   Figures out if we are running inside Xen HVM.\r
 \r
-  @return UINT32     CPUID index used to connect to HV.\r
+  @retval TRUE   Xen was detected\r
+  @retval FALSE  Xen was not detected\r
 \r
 **/\r
-UINT32\r
+BOOLEAN\r
 XenDetect (\r
   VOID\r
   )\r
 {\r
-\r
-  UINT32 XenLeaf;\r
   UINT8 Signature[13];\r
 \r
-  for (XenLeaf = 0x40000000; XenLeaf < 0x40010000; XenLeaf += 0x100) {\r
-    AsmCpuid (XenLeaf, NULL, (UINT32 *) &Signature[0],\r
+  if (mXenLeaf != 0) {\r
+    return TRUE;\r
+  }\r
+\r
+  Signature[12] = '\0';\r
+  for (mXenLeaf = 0x40000000; mXenLeaf < 0x40010000; mXenLeaf += 0x100) {\r
+    AsmCpuid (mXenLeaf,\r
+              NULL,\r
+              (UINT32 *) &Signature[0],\r
               (UINT32 *) &Signature[4],\r
               (UINT32 *) &Signature[8]);\r
-    Signature[12] = '\0';\r
 \r
     if (!AsciiStrCmp ((CHAR8 *) Signature, "XenVMMXenVMM")) {\r
       mXen = TRUE;\r
-      return XenLeaf;\r
+      return TRUE;\r
     }\r
   }\r
 \r
-  return 0;\r
+  mXenLeaf = 0;\r
+  return FALSE;\r
 }\r
 \r
 /**\r
@@ -150,10 +158,14 @@ XenDetect (
 **/\r
 EFI_STATUS\r
 InitializeXen (\r
-  UINT32 XenLeaf\r
+  VOID\r
   )\r
 {\r
-  XenConnect (XenLeaf);\r
+  if (mXenLeaf == 0) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  XenConnect (mXenLeaf);\r
 \r
   //\r
   // Reserve away HVMLOADER reserved memory [0xFC000000,0xFD000000).\r