OvmfPkg/PlatformPei: Hide Xen Leaf details

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15202 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 0763f21fac862d7ab1a1e68a82bdfe72d46f6850..6166226481a4130192be52710c6a829a1b00d3f2 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -410,7 +410,6 @@ InitializePlatform (
   )\r
 {\r
   EFI_PHYSICAL_ADDRESS  TopOfMemory;\r
-  UINT32 XenLeaf;\r
 \r
   TopOfMemory = 0;\r
 \r
@@ -418,7 +417,7 @@ InitializePlatform (
 \r
   DebugDumpCmos ();\r
 \r
-  XenLeaf = XenDetect ();\r
+  XenDetect ();\r
 \r
   BootModeInitialization ();\r
 \r
@@ -432,7 +431,7 @@ InitializePlatform (
 \r
   if (mXen) {\r
     DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r
-    InitializeXen (XenLeaf);\r
+    InitializeXen ();\r
   }\r
 \r
   ReserveEmuVariableNvStore ();\r

diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h
index cc371c57f7d49a40ce6094598ba4ba57225c6a1c..4b72ee6b72df9018ce4ee27582d84e8e57505fc2 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.h
+++ b/OvmfPkg/PlatformPei/Platform.h
@@ -76,10 +76,10 @@ PeiFvInitialization (
 \r
 EFI_STATUS\r
 InitializeXen (\r
-  UINT32 XenLeaf\r
+  VOID\r
   );\r
 \r
-UINT32\r
+BOOLEAN\r
 XenDetect (\r
   VOID\r
   );\r

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