OvmfPkg/PlatformPei: NoExec: stop using mPlatformInfoHob

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

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index f2c1e2b213cb3fa82cc47127793cdefcc31d1e41..7f3a26092626816472461ede07e7704dac389901 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -75,16 +75,17 @@ MemMapInitialization (
   ASSERT_RETURN_ERROR (PcdStatus);\r
 }\r
 \r
+STATIC\r
 VOID\r
 NoexecDxeInitialization (\r
-  VOID\r
+  IN OUT EFI_HOB_PLATFORM_INFO  *PlatformInfoHob\r
   )\r
 {\r
   RETURN_STATUS  Status;\r
 \r
-  Status = PlatformNoexecDxeInitialization (&mPlatformInfoHob);\r
+  Status = PlatformNoexecDxeInitialization (PlatformInfoHob);\r
   if (!RETURN_ERROR (Status)) {\r
-    Status = PcdSetBoolS (PcdSetNxForStack, mPlatformInfoHob.PcdSetNxForStack);\r
+    Status = PcdSetBoolS (PcdSetNxForStack, PlatformInfoHob->PcdSetNxForStack);\r
     ASSERT_RETURN_ERROR (Status);\r
   }\r
 }\r
@@ -357,11 +358,11 @@ InitializePlatform (
 \r
   if (mPlatformInfoHob.SmmSmramRequire) {\r
     Q35BoardVerification ();\r
-    Q35TsegMbytesInitialization ();\r
-    Q35SmramAtDefaultSmbaseInitialization ();\r
+    Q35TsegMbytesInitialization (&mPlatformInfoHob);\r
+    Q35SmramAtDefaultSmbaseInitialization (&mPlatformInfoHob);\r
   }\r
 \r
-  PublishPeiMemory ();\r
+  PublishPeiMemory (&mPlatformInfoHob);\r
 \r
   PlatformQemuUc32BaseInitialization (&mPlatformInfoHob);\r
 \r
@@ -372,10 +373,10 @@ InitializePlatform (
       ReserveEmuVariableNvStore ();\r
     }\r
 \r
-    PeiFvInitialization ();\r
-    MemTypeInfoInitialization ();\r
+    PeiFvInitialization (&mPlatformInfoHob);\r
+    MemTypeInfoInitialization (&mPlatformInfoHob);\r
     MemMapInitialization (&mPlatformInfoHob);\r
-    NoexecDxeInitialization ();\r
+    NoexecDxeInitialization (&mPlatformInfoHob);\r
   }\r
 \r
   InstallClearCacheCallback ();\r