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

MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf

@@ -54,6 +54,9 @@
   gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES
   gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES
 
+[Guids]
+  gEfiEventVirtualAddressChangeGuid
+
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize

MdeModulePkg/Universal/Variable/EmuRuntimeDxe/InitVariable.c

@@ -237,11 +237,12 @@ VariableServiceInitialize (
                   );
   ASSERT_EFI_ERROR (Status);
 
-  Status = gBS->CreateEvent (
-                  EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
+  Status = gBS->CreateEventEx (
+                  EVT_NOTIFY_SIGNAL,
                   TPL_NOTIFY,
                   VariableClassAddressChangeEvent,
                   NULL,
+                  &gEfiEventVirtualAddressChangeGuid,
                   &mVirtualAddressChangeEvent
                   );
   ASSERT_EFI_ERROR (Status);

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>
 #include <VariableFormat.h>
 
+#include <Guid/EventGroup.h>
+
 #define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))
 
 typedef enum {