X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=SecurityPkg%2FTcg%2FTcgConfigDxe%2FTcgConfigImpl.c;fp=SecurityPkg%2FTcg%2FTcgConfigDxe%2FTcgConfigImpl.c;h=c172583441d6e7e5b6144863b76f44fa2d0a5741;hb=a0c56a8219ec268d8ac4e051035f1636545cc478;hp=0127819a904056319e27494503ee6e3466604be9;hpb=e24fc1032db5d5d2395260f6d7af94aa5a2a0802;p=mirror_edk2.git

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 0127819a90..c172583441 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "TcgConfigImpl.h"
 
-EFI_GUID                        mTcgFormSetGuid = TCG_CONFIG_PRIVATE_GUID;
 CHAR16                          mTcgStorageName[] = L"TCG_CONFIGURATION";
 
 TCG_CONFIG_PRIVATE_DATA         mTcgConfigPrivateDateTemplate = {
@@ -36,7 +35,7 @@ HII_VENDOR_DEVICE_PATH          mTcgHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
       }
     },
-    TCG_CONFIG_PRIVATE_GUID
+    TCG_CONFIG_FORM_SET_GUID
   },
   {
     END_DEVICE_PATH_TYPE,
@@ -166,7 +165,7 @@ TcgExtractConfig (
   }
 
   *Progress = Request;
-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mTcgFormSetGuid, mTcgStorageName)) {
+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gTcgConfigFormSetGuid, mTcgStorageName)) {
     return EFI_NOT_FOUND;
   }
 
@@ -220,7 +219,7 @@ TcgExtractConfig (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator
     //
-    ConfigRequestHdr = HiiConstructConfigHdr (&mTcgFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);
+    ConfigRequestHdr = HiiConstructConfigHdr (&gTcgConfigFormSetGuid, mTcgStorageName, PrivateData->DriverHandle);
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
     ConfigRequest = AllocateZeroPool (Size);
     ASSERT (ConfigRequest != NULL);
@@ -290,7 +289,7 @@ TcgRouteConfig (
   }
 
   *Progress = Configuration;
-  if (!HiiIsConfigHdrMatch (Configuration, &mTcgFormSetGuid, mTcgStorageName)) {
+  if (!HiiIsConfigHdrMatch (Configuration, &gTcgConfigFormSetGuid, mTcgStorageName)) {
     return EFI_NOT_FOUND;
   }
 
@@ -460,7 +459,7 @@ InstallTcgConfigForm (
   // Publish the HII package list
   //
   HiiHandle = HiiAddPackages (
-                &mTcgFormSetGuid,
+                &gTcgConfigFormSetGuid,
                 DriverHandle,
                 TcgConfigDxeStrings,
                 TcgConfigBin,