use the GUIDed versions of events listed below: EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE...

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

diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c
index 2ebd50c29fd705967a5297a6e6d4e4b3ce27b4a0..6f88a90f4e56e1054103aea6ea746a217070cb2c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c
+++ b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Init.c
@@ -1031,20 +1031,22 @@ InitializeUndi(
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   UndiNotifyExitBs,\r
                   NULL,\r
+                  &gEfiEventExitBootServicesGuid,\r
                   &Event\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   UndiNotifyVirtual,\r
                   NULL,\r
+                  &gEfiEventVirtualAddressChangeGuid,\r
                   &Event\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/UndiRuntimeDxe.inf b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/UndiRuntimeDxe.inf
index 24bcaad0d202f7332a768c0ba4c59ca68f7f46b7..2fd1da2125d340f1cb7ae2591bee75b51d2f553a 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/UndiRuntimeDxe.inf
+++ b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/UndiRuntimeDxe.inf
@@ -52,6 +52,10 @@
   gEfiPciIoProtocolGuid\r
   gEfiDevicePathProtocolGuid\r
 \r
+[Guids]\r
+  gEfiEventExitBootServicesGuid        ## PRODUCES ## Event\r
+  gEfiEventVirtualAddressChangeGuid    ## PRODUCES ## Event\r
+\r
 [Depex]\r
   gEfiBdsArchProtocolGuid AND\r
   gEfiCpuArchProtocolGuid AND\r

diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf b/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf
index 3a568506f7e84e06ef34dc47426b3ba113165f66..b28d2afb2431e640e0807204051b518653807f58 100644 (file)
--- a/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.inf
@@ -53,3 +53,6 @@
   gEfiFirmwareVolumeBlockProtocolGuid           ## NOTIFY\r
   gEfiFvbExtensionProtocolGuid                  ## CONSUMES\r
 \r
+[Guids]\r
+  gEfiEventVirtualAddressChangeGuid             ## PRODUCES\r
+\r

diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c
index f1fe99d932b4df5b772658b3797877eef5828e61..0e412860d5aac1f9ec8bf93aef4915d4cc7d23e1 100644 (file)
--- a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.c
@@ -298,11 +298,12 @@ FvbLibInitialize (
   //\r
   // Register SetVirtualAddressMap () notify function\r
   //\r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   FvbVirtualAddressChangeNotifyEvent,\r
                   NULL,\r
+                  &gEfiEventVirtualAddressChangeGuid,\r
                   &mSetVirtualMapChangedEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h
index 7d0a09c7e1f0cda46425a2c820e34d5010dfcf76..1981e9682dc5accd47151295a9526f29b45661da 100644 (file)
--- a/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h
+++ b/MdeModulePkg/Library/EdkFvbServiceLib/Fvb.h
@@ -33,6 +33,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 \r
+#include <Guid/EventGroup.h>\r
+\r
 #define MAX_FVB_COUNT 16\r
 \r
 typedef struct {\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index d18ed2b60707ee76329c181858d2fe3bdf37711e..3f00007ddb4fb0a0b795247151989d51200a00e8 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -94,3 +94,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   gEfiAcpiSupportProtocolGuid\r
   gEfiDhcp4ProtocolGuid\r
   gEfiDhcp4ServiceBindingProtocolGuid\r
+\r
+[Guids]\r
+  gEfiEventExitBootServicesGuid\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index dad1cd40bc20933ef602992bcc0a4ba142123d79..d45a7362b3981878b7c87303689927f673f7c05d 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -20,6 +20,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/NetLib.h>\r
 #include <Library/PrintLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
+\r
+#include <Guid/EventGroup.h>\r
+\r
 #include "IScsiCommon.h"\r
 #include "IScsiDriver.h"\r
 #include "IScsiInitiatorName.h"\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index a9e255f616a48ff2e40e7b8f78309e32e0719743..3a727099e4502099cfb14f93d3209f6c14d3f0f4 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -536,11 +536,12 @@ IScsiCreateDriverData (
   // Create an event to be signal when the BS to RT transition is triggerd so\r
   // as to abort the iSCSI session.\r
   //\r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_CALLBACK,\r
                   IScsiOnExitBootService,\r
                   Private,\r
+                  &gEfiEventExitBootServicesGuid,\r
                   &Private->ExitBootServiceEvent\r
                   );\r
   if (EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
index 1344405ce2ea45a3d9ce0057e9462d4572e160e6..7d298b8631bfe8addd36fc1ee083d0877e0965bd 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
@@ -54,6 +54,9 @@
   gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES\r
   gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES\r
 \r
+[Guids]\r
+  gEfiEventVirtualAddressChangeGuid\r
+\r
 [Pcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
index 2aa3e28853d74b8ad77bf17f87fe5598eaf37fe3..a08af6dae404b547c5a8d7053c0f67e86100053b 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c
@@ -237,11 +237,12 @@ VariableServiceInitialize (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   VariableClassAddressChangeEvent,\r
                   NULL,\r
+                  &gEfiEventVirtualAddressChangeGuid,\r
                   &mVirtualAddressChangeEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 3880ed55c975e9afb42f28bd47a970607d8bb569..482a192a381eb4de6e64e44fe65ed59846d7be87 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
@@ -33,6 +33,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>\r
 #include <VariableFormat.h>\r
 \r
+#include <Guid/EventGroup.h>\r
+\r
 #define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))\r
 \r
 typedef enum {\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 553ae2824d1d35fb764be5d4eb5387b28e60d134..6d3967947d7c8f0dc02f7b739bff853fa17a2f06 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -2063,11 +2063,12 @@ VariableServiceInitialize (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->CreateEvent (\r
-                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
                   VariableClassAddressChangeEvent,\r
                   NULL,\r
+                  &gEfiEventVirtualAddressChangeGuid,\r
                   &mVirtualAddressChangeEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index c8f1d83e709c9b4410aeb773d99eb06bdb918e0e..c508d8bade0d625e6814f03379835969775608a3 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -36,6 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Guid/VariableInfo.h>\r
 #include <Guid/GlobalVariable.h>\r
+#include <Guid/EventGroup.h>\r
 #include <VariableFormat.h>\r
 \r
 #define VARIABLE_RECLAIM_THRESHOLD (1024)\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index 11f5c8142df0cdd1383aa64fdee48c4c7f97b19a..5a47fa4a245fc2c8952f049da656ab746e044bc8 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -62,6 +62,7 @@
 [Guids]\r
   gEfiVariableInfoGuid                          ## PRODUCES ## Configuration Table Guid \r
   gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid\r
+  gEfiEventVirtualAddressChangeGuid             ## PRODUCES ## Event\r
 \r
 [Pcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r