use the GUIDed versions of events listed below: EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE and EVT_SIGNAL_EXIT_BOOT_SERVICES

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

3 files changed, 9 insertions, 2 deletions

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index d18ed2b..3f00007 100644
--- 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

   gEfiDhcp4ProtocolGuid

   gEfiDhcp4ServiceBindingProtocolGuid

+

+[Guids]

+  gEfiEventExitBootServicesGuid

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index dad1cd4..d45a736 100644
--- 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>

 #include <Library/PrintLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

+

+#include <Guid/EventGroup.h>

+

 #include "IScsiCommon.h"

 #include "IScsiDriver.h"

 #include "IScsiInitiatorName.h"

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index a9e255f..3a72709 100644
--- 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

   // as to abort the iSCSI session.

   //

-  Status = gBS->CreateEvent (

-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,

+  Status = gBS->CreateEventEx (

+                  EVT_NOTIFY_SIGNAL,

                   TPL_CALLBACK,

                   IScsiOnExitBootService,

                   Private,

+                  &gEfiEventExitBootServicesGuid,

                   &Private->ExitBootServiceEvent

                   );

   if (EFI_ERROR (Status)) {