OvmfPkg/AmdSevDxe: sort #includes, and entries in INF file sections

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

diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
index 7fa9019f1a053f6e46876cec4609851f99834337..ab38f97a67aa4a1334f4bbfd3f381718615a23d9 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 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2011, Andrei Warkentin <andreiw@motorola.com>\r
 \r
   This program and the accompanying materials\r
@@ -171,6 +171,7 @@ XenPublishRamRegions (
   //\r
   // Parse RAM in E820 map\r
   //\r
+  E820EntriesCount = 0;\r
   Status = XenGetE820Map (&E820Map, &E820EntriesCount);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -189,11 +190,7 @@ XenPublishRamRegions (
         continue;\r
       }\r
 \r
-      if (Entry->BaseAddr >= BASE_4GB) {\r
-        AddUntestedMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
-      } else {\r
-        AddMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
-      }\r
+      AddMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
 \r
       MtrrSetMemoryAttribute (Entry->BaseAddr, Entry->Length, CacheWriteBack);\r
     }\r
@@ -213,6 +210,8 @@ InitializeXen (
   VOID\r
   )\r
 {\r
+  RETURN_STATUS PcdStatus;\r
+\r
   if (mXenLeaf == 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -225,7 +224,8 @@ InitializeXen (
   //\r
   AddReservedMemoryBaseSizeHob (0xFC000000, 0x1000000, FALSE);\r
 \r
-  PcdSetBool (PcdPciDisableBusEnumeration, TRUE);\r
+  PcdStatus = PcdSetBoolS (PcdPciDisableBusEnumeration, TRUE);\r
+  ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   return EFI_SUCCESS;\r
 }\r