OvmfPkg: PlatformPei: simplify memory range expressions in MemDetect()

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

diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
index 1bb6b50a4d9b8562fd1ba3c0c3d6c99c191dda89..8e5d79e8b8fd0e7d8e21ca673ee2179990924b9a 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 - 2013, 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,37 @@
 #include <Guid/XenInfo.h>\r
 \r
 #include "Platform.h"\r
+#include "Xen.h"\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
@@ -66,8 +94,8 @@ XenConnect (
   AsmCpuid (XenLeaf + 1, &XenVersion, NULL, NULL, NULL);\r
   DEBUG ((EFI_D_ERROR, "Detected Xen version %d.%d\n",\r
           XenVersion >> 16, XenVersion & 0xFFFF));\r
-  mXenInfo.VersionMajor = XenVersion >> 16;\r
-  mXenInfo.VersionMinor = XenVersion & 0xFFFF;\r
+  mXenInfo.VersionMajor = (UINT16)(XenVersion >> 16);\r
+  mXenInfo.VersionMinor = (UINT16)(XenVersion & 0xFFFF);\r
 \r
   /* TBD: Locate hvm_info and reserve it away. */\r
   mXenInfo.HvmInfo = NULL;\r
@@ -119,19 +147,9 @@ XenDetect (
 **/\r
 EFI_STATUS\r
 InitializeXen (\r
-  VOID\r
+  UINT32 XenLeaf\r
   )\r
 {\r
-  UINT32 XenLeaf;\r
-\r
-  XenLeaf = XenDetect ();\r
-\r
-  if (XenLeaf == 0) {\r
-    return EFI_NOT_FOUND;\r
-  }\r
-\r
-  DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r
-\r
   XenConnect (XenLeaf);\r
 \r
   //\r