install mReadOnlyVariableThunkPresent PPI to insure that only one ReadOnlyVariable...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5337 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
index d7d4df6ebc94c4d882a0834e1f76380c58a90285..756787e27b1258f7b9c0a046783e118194d00aef 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2ToReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.c
@@ -73,7 +73,7 @@ EFI_PEI_PPI_DESCRIPTOR     mReadOnlyVariableThunkPresent = {
     (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
     &gPeiReadonlyVariableThunkPresentPpiGuid,\r
     NULL\r
-  };\r
+};\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -109,7 +109,9 @@ Returns:
   Status = PeiServicesLocatePpi (&gPeiReadonlyVariableThunkPresentPpiGuid, 0, NULL, &Interface);\r
   ASSERT (Status == EFI_NOT_FOUND);\r
   \r
-  PeiServicesInstallPpi (&mReadOnlyVariableThunkPresent);\r
+  Status = PeiServicesInstallPpi (&mReadOnlyVariableThunkPresent);\r
+  ASSERT_EFI_ERROR (Status);\r
+  \r
   //\r
   // Publish the variable capability to other modules\r
   //\r

diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c
index fcb6fb53f1e0df6443f3d0e20fbfafed6cc1ca57..0e531e3a5fd709eaade33e2ef21e9261fc2449a3 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableToReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.c
@@ -66,6 +66,13 @@ EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
   &mVariablePpi\r
 };\r
 \r
+EFI_PEI_PPI_DESCRIPTOR     mReadOnlyVariableThunkPresent = {\r
+    (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
+    &gPeiReadonlyVariableThunkPresentPpiGuid,\r
+    NULL\r
+};\r
+\r
+\r
 /**\r
   Standard entry point of a PEIM.\r
 \r
@@ -92,6 +99,9 @@ PeimInitializeReadOnlyVariable (
   Status = PeiServicesLocatePpi (&gPeiReadonlyVariableThunkPresentPpiGuid, 0, NULL, &Interface);\r
   ASSERT (Status == EFI_NOT_FOUND);\r
 \r
+  Status = PeiServicesInstallPpi (&mReadOnlyVariableThunkPresent);\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
   //\r
   // Publish the variable capability to other modules\r
   //\r