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 a720b91b99bb1ad7ea26c0cf276eecd6ab5979de..da3133bb9b7aa16625e2694e14bcc81ab0d9da34 100644 (file)
--- a/OvmfPkg/PlatformPei/Xen.c
+++ b/OvmfPkg/PlatformPei/Xen.c
@@ -1,7 +1,7 @@
 /**@file\r
   Xen Platform PEI support\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2011, Andrei Warkentin <andreiw@motorola.com>\r
 \r
   This program and the accompanying materials\r
@@ -29,9 +29,41 @@
 #include <Guid/XenInfo.h>\r
 \r
 #include "Platform.h"\r
+#include "Xen.h"\r
+\r
+BOOLEAN mXen = FALSE;\r
+\r
+STATIC UINT32 mXenLeaf = 0;\r
 \r
 EFI_XEN_INFO mXenInfo;\r
 \r
+/**\r
+  Returns E820 map provided by Xen\r
+\r
+  @param Entries      Pointer to E820 map\r
+  @param Count        Number of entries\r
+\r
+  @return EFI_STATUS\r
+**/\r
+EFI_STATUS\r
+XenGetE820Map (\r
+  EFI_E820_ENTRY64 **Entries,\r
+  UINT32 *Count\r
+  )\r
+{\r
+  EFI_XEN_OVMF_INFO *Info =\r
+    (EFI_XEN_OVMF_INFO *)(UINTN) OVMF_INFO_PHYSICAL_ADDRESS;\r
+\r
+  if (AsciiStrCmp ((CHAR8 *) Info->Signature, "XenHVMOVMF")) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  ASSERT (Info->E820 < MAX_ADDRESS);\r
+  *Entries = (EFI_E820_ENTRY64 *)(UINTN) Info->E820;\r
+  *Count = Info->E820EntriesCount;\r
+\r
+  return EFI_SUCCESS;\r
+}\r
 \r
 /**\r
   Connects to the Hypervisor.\r
@@ -84,30 +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
-      return XenLeaf;\r
+      mXen = TRUE;\r
+      return TRUE;\r
     }\r
   }\r
 \r
-  return 0;\r
+  mXenLeaf = 0;\r
+  return FALSE;\r
 }\r
 \r
 /**\r
@@ -122,17 +161,11 @@ InitializeXen (
   VOID\r
   )\r
 {\r
-  UINT32 XenLeaf;\r
-\r
-  XenLeaf = XenDetect ();\r
-\r
-  if (XenLeaf == 0) {\r
+  if (mXenLeaf == 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r
-\r
-  XenConnect (XenLeaf);\r
+  XenConnect (mXenLeaf);\r
 \r
   //\r
   // Reserve away HVMLOADER reserved memory [0xFC000000,0xFD000000).\r