Signed-off-by: Jordan Justen <[email protected]> --- OvmfPkg/PlatformPei/Platform.c | 8 ++++---- OvmfPkg/PlatformPei/Platform.h | 4 +++- OvmfPkg/PlatformPei/Xen.c | 5 ++++- 3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 10ae623..7ba4ab2 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -1,7 +1,7 @@ /**@file Platform PEI driver - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2011, Andrei Warkentin <[email protected]> This program and the accompanying materials @@ -422,13 +422,13 @@ InitializePlatform ( PublishPeiMemory (); - if (XenLeaf != 0) { + if (mXen) { PcdSetBool (PcdPciDisableBusEnumeration, TRUE); } else { TopOfMemory = MemDetect (); } - if (XenLeaf != 0) { + if (mXen) { DEBUG ((EFI_D_INFO, "Xen was detected\n")); InitializeXen (XenLeaf); } @@ -437,7 +437,7 @@ InitializePlatform ( PeiFvInitialization (); - if (XenLeaf != 0) { + if (mXen) { XenMemMapInitialization (); } else { MemMapInitialization (TopOfMemory); diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h index 5378b9d..cc371c5 100644 --- a/OvmfPkg/PlatformPei/Platform.h +++ b/OvmfPkg/PlatformPei/Platform.h @@ -1,7 +1,7 @@ /** @file Platform PEI module include file. - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -84,6 +84,8 @@ XenDetect ( VOID ); +extern BOOLEAN mXen; + EFI_STATUS XenGetE820Map ( EFI_E820_ENTRY64 **Entries, diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c index 8e5d79e..0f75fa7 100644 --- a/OvmfPkg/PlatformPei/Xen.c +++ b/OvmfPkg/PlatformPei/Xen.c @@ -1,7 +1,7 @@ /**@file Xen Platform PEI support - Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2011, Andrei Warkentin <[email protected]> This program and the accompanying materials @@ -31,6 +31,8 @@ #include "Platform.h" #include "Xen.h" +BOOLEAN mXen = FALSE; + EFI_XEN_INFO mXenInfo; /** @@ -131,6 +133,7 @@ XenDetect ( Signature[12] = '\0'; if (!AsciiStrCmp ((CHAR8 *) Signature, "XenVMMXenVMM")) { + mXen = TRUE; return XenLeaf; } } -- 1.8.5.3 ------------------------------------------------------------------------------ WatchGuard Dimension instantly turns raw network data into actionable security intelligence. It gives you real-time visual feedback on key security issues and trends. Skip the complicated setup - simply import a virtual appliance and go from zero to informed in seconds. http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
