OvmfPkg/EnrollDefaultKeys: clean up global variable name prefixes

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

diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
index 3a4358251e3889e7f4ef8a1e97ee56948a342e4e..89dc4143b23b6fa060ca216ca8211b2b73d65a2c 100644 (file)
--- a/OvmfPkg/PlatformPei/Xen.c
+++ b/OvmfPkg/PlatformPei/Xen.c
@@ -4,13 +4,7 @@
   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
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -171,6 +165,7 @@ XenPublishRamRegions (
   //\r
   // Parse RAM in E820 map\r
   //\r
+  E820EntriesCount = 0;\r
   Status = XenGetE820Map (&E820Map, &E820EntriesCount);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
@@ -209,6 +204,8 @@ InitializeXen (
   VOID\r
   )\r
 {\r
+  RETURN_STATUS PcdStatus;\r
+\r
   if (mXenLeaf == 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -221,7 +218,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