Index: /trunk/include/VBox/log.h
===================================================================
--- /trunk/include/VBox/log.h	(revision 79521)
+++ /trunk/include/VBox/log.h	(revision 79522)
@@ -59,5 +59,5 @@
  *              A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _
  */
-typedef enum LOGGROUP
+typedef enum VBOXLOGGROUP
 {
     /** The default VBox group. */
@@ -117,8 +117,8 @@
     /** IDE Device group. */
     LOG_GROUP_DEV_IDE,
+    /** The internal networking IP stack Device group. */
+    LOG_GROUP_DEV_INIP,
     /** I/O APIC Device group. */
     LOG_GROUP_DEV_IOAPIC,
-    /** The internal networking IP stack Device group. */
-    LOG_GROUP_DEV_INIP,
     /** KeyBoard Controller Device group. */
     LOG_GROUP_DEV_KBD,
@@ -315,6 +315,4 @@
     /** lwIP group, TCP_DEBUG */
     LOG_GROUP_LWIP_TCP,
-    /** lwIP group, tcpip.c TCPIP_DEBUG */
-    LOG_GROUP_LWIP_TCPIP,
     /** lwIP group, TCP_CWND_DEBUG (congestion window) */
     LOG_GROUP_LWIP_TCP_CWND,
@@ -333,4 +331,6 @@
     /** lwIP group, tcp_in.c TCP_WND_DEBUG (window updates) */
     LOG_GROUP_LWIP_TCP_WND,
+    /** lwIP group, tcpip.c TCPIP_DEBUG */
+    LOG_GROUP_LWIP_TCPIP,
     /** lwIP group, timers.c TIMERS_DEBUG */
     LOG_GROUP_LWIP_TIMERS,
@@ -341,30 +341,20 @@
     /** Main group, IAdditionsFacility. */
     LOG_GROUP_MAIN_ADDITIONSFACILITY,
-    /** Main group, IAdditionsStateChangedEvent. */
-    LOG_GROUP_MAIN_ADDITIONSSTATECHANGEDEVENT,
     /** Main group, IAppliance. */
     LOG_GROUP_MAIN_APPLIANCE,
     /** Main group, IAudioAdapter. */
     LOG_GROUP_MAIN_AUDIOADAPTER,
-    /** Main group, IAudioAdapterChangedEvent. */
-    LOG_GROUP_MAIN_AUDIOADAPTERCHANGEDEVENT,
     /** Main group, IBandwidthControl. */
     LOG_GROUP_MAIN_BANDWIDTHCONTROL,
     /** Main group, IBandwidthGroup. */
     LOG_GROUP_MAIN_BANDWIDTHGROUP,
-    /** Main group, IBandwidthGroupChangedEvent. */
-    LOG_GROUP_MAIN_BANDWIDTHGROUPCHANGEDEVENT,
     /** Main group, IBIOSSettings. */
     LOG_GROUP_MAIN_BIOSSETTINGS,
     /** Main group, IBooleanFormValue. */
     LOG_GROUP_MAIN_BOOLEANFORMVALUE,
-    /** Main group, ICanShowWindowEvent. */
-    LOG_GROUP_MAIN_CANSHOWWINDOWEVENT,
     /** Main group, ICertificate. */
     LOG_GROUP_MAIN_CERTIFICATE,
     /** Main group, IChoiceFormValue. */
     LOG_GROUP_MAIN_CHOICEFORMVALUE,
-    /** Main group, IClipboardModeChangedEvent. */
-    LOG_GROUP_MAIN_CLIPBOARDMODECHANGEDEVENT,
     /** Main group, ICloudClient. */
     LOG_GROUP_MAIN_CLOUDCLIENT,
@@ -377,12 +367,4 @@
     /** Main group, IConsole. */
     LOG_GROUP_MAIN_CONSOLE,
-    /** Main group, ICPUChangedEvent. */
-    LOG_GROUP_MAIN_CPUCHANGEDEVENT,
-    /** Main group, ICPUExecutionCapChangedEvent. */
-    LOG_GROUP_MAIN_CPUEXECUTIONCAPCHANGEDEVENT,
-    /** Main group, ICursorPositionChangedEvent. */
-    LOG_GROUP_MAIN_CURSORPOSITIONCHANGEDEVENT,
-    /** Main group, IGuestMonitorInfoChangedEvent. */
-    LOG_GROUP_MAIN_GUESTMONITORINFOCHANGEDEVENT,
     /** Main group, IDataModel. */
     LOG_GROUP_MAIN_DATAMODEL,
@@ -399,6 +381,4 @@
     /** Main group, IDnDBase. */
     LOG_GROUP_MAIN_DNDBASE,
-    /** Main group, IDnDModeChangedEvent. */
-    LOG_GROUP_MAIN_DNDMODECHANGEDEVENT,
     /** Main group, IDnDSource. */
     LOG_GROUP_MAIN_DNDSOURCE,
@@ -413,6 +393,4 @@
     /** Main group, IEventSource. */
     LOG_GROUP_MAIN_EVENTSOURCE,
-    /** Main group, IEventSourceChangedEvent. */
-    LOG_GROUP_MAIN_EVENTSOURCECHANGEDEVENT,
     /** Main group, IExtPack. */
     LOG_GROUP_MAIN_EXTPACK,
@@ -425,8 +403,4 @@
     /** Main group, IExtPackPlugIn. */
     LOG_GROUP_MAIN_EXTPACKPLUGIN,
-    /** Main group, IExtraDataCanChangeEvent. */
-    LOG_GROUP_MAIN_EXTRADATACANCHANGEEVENT,
-    /** Main group, IExtraDataChangedEvent. */
-    LOG_GROUP_MAIN_EXTRADATACHANGEDEVENT,
     /** Main group, IFile. */
     LOG_GROUP_MAIN_FILE,
@@ -457,24 +431,6 @@
     /** Main group, IGuestFileIOEvent. */
     LOG_GROUP_MAIN_GUESTFILEIOEVENT,
-    /** Main group, IGuestFileOffsetChangedEvent. */
-    LOG_GROUP_MAIN_GUESTFILEOFFSETCHANGEDEVENT,
-    /** Main group, IGuestFileReadEvent. */
-    LOG_GROUP_MAIN_GUESTFILEREADEVENT,
-    /** Main group, IGuestFileRegisteredEvent. */
-    LOG_GROUP_MAIN_GUESTFILEREGISTEREDEVENT,
-    /** Main group, IGuestFileStateChangedEvent. */
-    LOG_GROUP_MAIN_GUESTFILESTATECHANGEDEVENT,
-    /** Main group, IGuestFileWriteEvent. */
-    LOG_GROUP_MAIN_GUESTFILEWRITEEVENT,
     /** Main group, IGuestFsObjInfo. */
     LOG_GROUP_MAIN_GUESTFSOBJINFO,
-    /** Main group, IGuestKeyboardEvent. */
-    LOG_GROUP_MAIN_GUESTKEYBOARDEVENT,
-    /** Main group, IGuestMonitorChangedEvent. */
-    LOG_GROUP_MAIN_GUESTMONITORCHANGEDEVENT,
-    /** Main group, IGuestMouseEvent. */
-    LOG_GROUP_MAIN_GUESTMOUSEEVENT,
-    /** Main group, IGuestMultiTouchEvent. */
-    LOG_GROUP_MAIN_GUESTMULTITOUCHEVENT,
     /** Main group, IGuestOSType. */
     LOG_GROUP_MAIN_GUESTOSTYPE,
@@ -483,16 +439,6 @@
     /** Main group, IGuestProcessEvent. */
     LOG_GROUP_MAIN_GUESTPROCESSEVENT,
-    /** Main group, IGuestProcessInputNotifyEvent. */
-    LOG_GROUP_MAIN_GUESTPROCESSINPUTNOTIFYEVENT,
     /** Main group, IGuestProcessIOEvent. */
     LOG_GROUP_MAIN_GUESTPROCESSIOEVENT,
-    /** Main group, IGuestProcessOutputEvent. */
-    LOG_GROUP_MAIN_GUESTPROCESSOUTPUTEVENT,
-    /** Main group, IGuestProcessRegisteredEvent. */
-    LOG_GROUP_MAIN_GUESTPROCESSREGISTEREDEVENT,
-    /** Main group, IGuestProcessStateChangedEvent. */
-    LOG_GROUP_MAIN_GUESTPROCESSSTATECHANGEDEVENT,
-    /** Main group, IGuestPropertyChangedEvent. */
-    LOG_GROUP_MAIN_GUESTPROPERTYCHANGEDEVENT,
     /** Main group, IGuestScreenInfo. */
     LOG_GROUP_MAIN_GUESTSCREENINFO,
@@ -501,18 +447,8 @@
     /** Main group, IGuestSessionEvent. */
     LOG_GROUP_MAIN_GUESTSESSIONEVENT,
-    /** Main group, IGuestSessionRegisteredEvent. */
-    LOG_GROUP_MAIN_GUESTSESSIONREGISTEREDEVENT,
-    /** Main group, IGuestSessionStateChangedEvent. */
-    LOG_GROUP_MAIN_GUESTSESSIONSTATECHANGEDEVENT,
-    /** Main group, IGuestUserStateChangedEvent. */
-    LOG_GROUP_MAIN_GUESTUSERSTATECHANGEDEVENT,
     /** Main group, IHost. */
     LOG_GROUP_MAIN_HOST,
-    /** Main group, IHostNameResolutionConfigurationChangeEvent. */
-    LOG_GROUP_MAIN_HOSTNAMERESOLUTIONCONFIGURATIONCHANGEEVENT,
     /** Main group, IHostNetworkInterface. */
     LOG_GROUP_MAIN_HOSTNETWORKINTERFACE,
-    /** Main group, IHostPCIDevicePlugEvent. */
-    LOG_GROUP_MAIN_HOSTPCIDEVICEPLUGEVENT,
     /** Main group, IHostUSBDevice. */
     LOG_GROUP_MAIN_HOSTUSBDEVICE,
@@ -527,66 +463,30 @@
     /** Main group, IKeyboard. */
     LOG_GROUP_MAIN_KEYBOARD,
-    /** Main group, IKeyboardLedsChangedEvent. */
-    LOG_GROUP_MAIN_KEYBOARDLEDSCHANGEDEVENT,
     /** Main group, IMachine. */
     LOG_GROUP_MAIN_MACHINE,
-    /** Main group, IMachineDataChangedEvent. */
-    LOG_GROUP_MAIN_MACHINEDATACHANGEDEVENT,
     /** Main group, IMachineDebugger. */
     LOG_GROUP_MAIN_MACHINEDEBUGGER,
     /** Main group, IMachineEvent. */
     LOG_GROUP_MAIN_MACHINEEVENT,
-    /** Main group, IMachineRegisteredEvent. */
-    LOG_GROUP_MAIN_MACHINEREGISTEREDEVENT,
-    /** Main group, IMachineStateChangedEvent. */
-    LOG_GROUP_MAIN_MACHINESTATECHANGEDEVENT,
     /** Main group, IMedium. */
     LOG_GROUP_MAIN_MEDIUM,
     /** Main group, IMediumAttachment. */
     LOG_GROUP_MAIN_MEDIUMATTACHMENT,
-    /** Main group, IMediumChangedEvent. */
-    LOG_GROUP_MAIN_MEDIUMCHANGEDEVENT,
-    /** Main group, IMediumConfigChangedEvent. */
-    LOG_GROUP_MAIN_MEDIUMCONFIGCHANGEDEVENT,
     /** Main group, IMediumFormat. */
     LOG_GROUP_MAIN_MEDIUMFORMAT,
     /** Main group, IMediumIO. */
     LOG_GROUP_MAIN_MEDIUMIO,
-    /** Main group, IMediumRegisteredEvent. */
-    LOG_GROUP_MAIN_MEDIUMREGISTEREDEVENT,
     /** Main group, IMouse. */
     LOG_GROUP_MAIN_MOUSE,
-    /** Main group, IMouseCapabilityChangedEvent. */
-    LOG_GROUP_MAIN_MOUSECAPABILITYCHANGEDEVENT,
     /** Main group, IMousePointerShape. */
     LOG_GROUP_MAIN_MOUSEPOINTERSHAPE,
-    /** Main group, IMousePointerShapeChangedEvent. */
-    LOG_GROUP_MAIN_MOUSEPOINTERSHAPECHANGEDEVENT,
     /** Main group, INATEngine. */
     LOG_GROUP_MAIN_NATENGINE,
     /** Main group, INATNetwork. */
     LOG_GROUP_MAIN_NATNETWORK,
-    /** Main group, INATNetworkAlterEvent. */
-    LOG_GROUP_MAIN_NATNETWORKALTEREVENT,
-    /** Main group, INATNetworkChangedEvent. */
-    LOG_GROUP_MAIN_NATNETWORKCHANGEDEVENT,
-    /** Main group, INATNetworkCreationDeletionEvent. */
-    LOG_GROUP_MAIN_NATNETWORKCREATIONDELETIONEVENT,
-    /** Main group, INATNetworkPortForwardEvent. */
-    LOG_GROUP_MAIN_NATNETWORKPORTFORWARDEVENT,
-    /** Main group, INATNetworkSettingEvent. */
-    LOG_GROUP_MAIN_NATNETWORKSETTINGEVENT,
-    /** Main group, INATNetworkStartStopEvent. */
-    LOG_GROUP_MAIN_NATNETWORKSTARTSTOPEVENT,
-    /** Main group, INATRedirectEvent. */
-    LOG_GROUP_MAIN_NATREDIRECTEVENT,
     /** Main group, INetworkAdapter. */
     LOG_GROUP_MAIN_NETWORKADAPTER,
-    /** Main group, INetworkAdapterChangedEvent. */
-    LOG_GROUP_MAIN_NETWORKADAPTERCHANGEDEVENT,
     /** Main group, IParallelPort. */
     LOG_GROUP_MAIN_PARALLELPORT,
-    /** Main group, IParallelPortChangedEvent. */
-    LOG_GROUP_MAIN_PARALLELPORTCHANGEDEVENT,
     /** Main group, IPCIAddress. */
     LOG_GROUP_MAIN_PCIADDRESS,
@@ -603,54 +503,24 @@
     /** Main group, IProgressEvent. */
     LOG_GROUP_MAIN_PROGRESSEVENT,
-    /** Main group, IProgressPercentageChangedEvent. */
-    LOG_GROUP_MAIN_PROGRESSPERCENTAGECHANGEDEVENT,
-    /** Main group, IProgressTaskCompletedEvent. */
-    LOG_GROUP_MAIN_PROGRESSTASKCOMPLETEDEVENT,
     /** Main group, IRangedIntegerFormValue. */
     LOG_GROUP_MAIN_RANGEDINTEGERFORMVALUE,
-    /** Main group, IRecordingChangedEvent. */
-    LOG_GROUP_MAIN_RECORDINGCHANGEDEVENT,
+    /** Main group, IRecordingScreenSettings. */
+    LOG_GROUP_MAIN_RECORDINGSCREENSETTINGS,
     /** Main group, IRecordingSettings. */
     LOG_GROUP_MAIN_RECORDINGSETTINGS,
-    /** Main group, IRecordingScreenSettings. */
-    LOG_GROUP_MAIN_RECORDINGSCREENSETTINGS,
     /** Main group, IReusableEvent. */
     LOG_GROUP_MAIN_REUSABLEEVENT,
-    /** Main group, IRuntimeErrorEvent. */
-    LOG_GROUP_MAIN_RUNTIMEERROREVENT,
     /** Main group, ISerialPort. */
     LOG_GROUP_MAIN_SERIALPORT,
-    /** Main group, ISerialPortChangedEvent. */
-    LOG_GROUP_MAIN_SERIALPORTCHANGEDEVENT,
     /** Main group, ISession. */
     LOG_GROUP_MAIN_SESSION,
-    /** Main group, ISessionStateChangedEvent. */
-    LOG_GROUP_MAIN_SESSIONSTATECHANGEDEVENT,
     /** Main group, ISharedFolder. */
     LOG_GROUP_MAIN_SHAREDFOLDER,
-    /** Main group, ISharedFolderChangedEvent. */
-    LOG_GROUP_MAIN_SHAREDFOLDERCHANGEDEVENT,
-    /** Main group, IShowWindowEvent. */
-    LOG_GROUP_MAIN_SHOWWINDOWEVENT,
     /** Main group, ISnapshot. */
     LOG_GROUP_MAIN_SNAPSHOT,
-    /** Main group, ISnapshotChangedEvent. */
-    LOG_GROUP_MAIN_SNAPSHOTCHANGEDEVENT,
-    /** Main group, ISnapshotDeletedEvent. */
-    LOG_GROUP_MAIN_SNAPSHOTDELETEDEVENT,
     /** Main group, ISnapshotEvent. */
     LOG_GROUP_MAIN_SNAPSHOTEVENT,
-    /** Main group, ISnapshotTakenEvent. */
-    LOG_GROUP_MAIN_SNAPSHOTRESTOREDEVENT,
-    /** Main group, ISnapshotRestoredEvent. */
-    LOG_GROUP_MAIN_SNAPSHOTTAKENEVENT,
-    /** Main group, IStateChangedEvent. */
-    LOG_GROUP_MAIN_STATECHANGEDEVENT,
     /** Main group, IStorageController. */
     LOG_GROUP_MAIN_STORAGECONTROLLER,
-    /** Main group, IStorageControllerChangedEvent. */
-    LOG_GROUP_MAIN_STORAGECONTROLLERCHANGEDEVENT,
-    /** Main group, IStorageDeviceChangedEvent. */
-    LOG_GROUP_MAIN_STORAGEDEVICECHANGEDEVENT,
     /** Main group, IStringArray. */
     LOG_GROUP_MAIN_STRINGARRAY,
@@ -667,6 +537,4 @@
     /** Main group, IUSBController. */
     LOG_GROUP_MAIN_USBCONTROLLER,
-    /** Main group, IUSBControllerChangedEvent. */
-    LOG_GROUP_MAIN_USBCONTROLLERCHANGEDEVENT,
     /** Main group, IUSBDevice. */
     LOG_GROUP_MAIN_USBDEVICE,
@@ -675,12 +543,8 @@
     /** Main group, IUSBDeviceFilters. */
     LOG_GROUP_MAIN_USBDEVICEFILTERS,
-    /** Main group, IUSBDeviceStateChangedEvent. */
-    LOG_GROUP_MAIN_USBDEVICESTATECHANGEDEVENT,
     /** Main group, IUSBProxyBackend. */
     LOG_GROUP_MAIN_USBPROXYBACKEND,
     /** Main group, IVBoxSVC. */
     LOG_GROUP_MAIN_VBOXSVC,
-    /** Main group, IVBoxSVCAvailabilityChangedEvent. */
-    LOG_GROUP_MAIN_VBOXSVCAVAILABILITYCHANGEDEVENT,
     /** Main group, IVetoEvent. */
     LOG_GROUP_MAIN_VETOEVENT,
@@ -701,10 +565,6 @@
     /** Main group, IVRDEServer. */
     LOG_GROUP_MAIN_VRDESERVER,
-    /** Main group, IVRDEServerChangedEvent. */
-    LOG_GROUP_MAIN_VRDESERVERCHANGEDEVENT,
     /** Main group, IVRDEServerInfo. */
     LOG_GROUP_MAIN_VRDESERVERINFO,
-    /** Main group, IVRDEServerInfoChangedEvent. */
-    LOG_GROUP_MAIN_VRDESERVERINFOCHANGEDEVENT,
     /** Misc. group intended for external use only. */
     LOG_GROUP_MISC,
@@ -815,6 +675,4 @@
     /** USB webcam. */
     LOG_GROUP_USB_WEBCAM,
-    /** VBox Guest Additions Driver (VBoxGuest). */
-    LOG_GROUP_VGDRV,
     /** VBox Guest Additions Library. */
     LOG_GROUP_VBGL,
@@ -843,4 +701,6 @@
     /** VMDK virtual disk backend. */
     LOG_GROUP_VD_VMDK,
+    /** VBox Guest Additions Driver (VBoxGuest). */
+    LOG_GROUP_VGDRV,
     /** VM group. */
     LOG_GROUP_VM,
@@ -856,5 +716,5 @@
     LOG_GROUP_WEBSERVICE
     /* !!!ALPHABETICALLY!!! */
-} VBOX_LOGGROUP;
+} VBOXLOGGROUP;
 
 
@@ -875,69 +735,69 @@
 {                   \
     RT_LOGGROUP_NAMES, \
-    "DEFAULT",      \
-    "AUDIO_MIXER",  \
+    "DEFAULT", \
+    "AUDIO_MIXER", \
     "AUDIO_MIXER_BUFFER", \
-    "AUTOLOGON",    \
-    "CFGM",         \
-    "CPUM",         \
-    "CSAM",         \
-    "DBGC",         \
-    "DBGF",         \
-    "DBGF_INFO",    \
-    "DBGG",         \
-    "DEV",          \
-    "DEV_AC97",     \
-    "DEV_ACPI",     \
-    "DEV_AHCI",     \
-    "DEV_APIC",     \
+    "AUTOLOGON", \
+    "CFGM", \
+    "CPUM", \
+    "CSAM", \
+    "DBGC", \
+    "DBGF", \
+    "DBGF_INFO", \
+    "DBGG", \
+    "DEV", \
+    "DEV_AC97", \
+    "DEV_ACPI", \
+    "DEV_AHCI", \
+    "DEV_APIC", \
     "DEV_BUSLOGIC", \
-    "DEV_DMA",      \
-    "DEV_E1000",    \
-    "DEV_EFI",      \
-    "DEV_EHCI",     \
-    "DEV_FDC",      \
-    "DEV_FLASH",    \
-    "DEV_GIM",      \
-    "DEV_HDA",      \
+    "DEV_DMA", \
+    "DEV_E1000", \
+    "DEV_EFI", \
+    "DEV_EHCI", \
+    "DEV_FDC", \
+    "DEV_FLASH", \
+    "DEV_GIM", \
+    "DEV_HDA", \
     "DEV_HDA_CODEC", \
-    "DEV_HPET",     \
-    "DEV_IDE",      \
-    "DEV_IOAPIC",   \
-    "DEV_INIP",     \
-    "DEV_KBD",      \
-    "DEV_LPC",      \
+    "DEV_HPET", \
+    "DEV_IDE", \
+    "DEV_INIP", \
+    "DEV_IOAPIC", \
+    "DEV_KBD", \
+    "DEV_LPC", \
     "DEV_LSILOGICSCSI", \
-    "DEV_NVME",     \
-    "DEV_OHCI",     \
+    "DEV_NVME", \
+    "DEV_OHCI", \
     "DEV_PARALLEL", \
-    "DEV_PC",       \
-    "DEV_PC_ARCH",  \
-    "DEV_PC_BIOS",  \
-    "DEV_PCI",      \
-    "DEV_PCI_RAW",  \
-    "DEV_PCNET",    \
-    "DEV_PIC",      \
-    "DEV_PIT",      \
-    "DEV_RTC",      \
-    "DEV_SB16",     \
-    "DEV_SERIAL",   \
-    "DEV_SMC",      \
-    "DEV_VGA",      \
-    "DEV_VIRTIO",   \
+    "DEV_PC", \
+    "DEV_PC_ARCH", \
+    "DEV_PC_BIOS", \
+    "DEV_PCI", \
+    "DEV_PCI_RAW", \
+    "DEV_PCNET", \
+    "DEV_PIC", \
+    "DEV_PIT", \
+    "DEV_RTC", \
+    "DEV_SB16", \
+    "DEV_SERIAL", \
+    "DEV_SMC", \
+    "DEV_VGA", \
+    "DEV_VIRTIO", \
     "DEV_VIRTIO_NET", \
-    "DEV_VMM",      \
+    "DEV_VMM", \
     "DEV_VMM_BACKDOOR", \
     "DEV_VMM_STDERR", \
-    "DEV_VMSVGA",   \
-    "DEV_XHCI",     \
-    "DIS",          \
-    "DRV",          \
-    "DRV_ACPI",     \
-    "DRV_AUDIO",    \
-    "DRV_BLOCK",    \
-    "DRV_CHAR",     \
+    "DEV_VMSVGA", \
+    "DEV_XHCI", \
+    "DIS", \
+    "DRV", \
+    "DRV_ACPI", \
+    "DRV_AUDIO", \
+    "DRV_BLOCK", \
+    "DRV_CHAR", \
     "DRV_DISK_INTEGRITY", \
-    "DRV_DISPLAY",  \
-    "DRV_FLOPPY",   \
+    "DRV_DISPLAY", \
+    "DRV_FLOPPY", \
     "DRV_HOST_AUDIO", \
     "DRV_HOST_BASE", \
@@ -946,86 +806,81 @@
     "DRV_HOST_PARALLEL", \
     "DRV_HOST_SERIAL", \
-    "DRV_INTNET",   \
-    "DRV_ISO",      \
+    "DRV_INTNET", \
+    "DRV_ISO", \
     "DRV_KBD_QUEUE", \
-    "DRV_LWIP",     \
+    "DRV_LWIP", \
     "DRV_MINIPORT", \
-    "DRV_MOUSE",    \
+    "DRV_MOUSE", \
     "DRV_MOUSE_QUEUE", \
     "DRV_NAMEDPIPE", \
-    "DRV_NAT",      \
+    "DRV_NAT", \
     "DRV_RAW_IMAGE", \
-    "DRV_SCSI",     \
+    "DRV_SCSI", \
     "DRV_SCSIHOST", \
     "DRV_TCP", \
     "DRV_TRANSPORT_ASYNC", \
-    "DRV_TUN",      \
+    "DRV_TUN", \
     "DRV_UDP", \
     "DRV_UDPTUNNEL", \
     "DRV_USBPROXY", \
-    "DRV_VBOXHDD",  \
-    "DRV_VD",       \
+    "DRV_VBOXHDD", \
+    "DRV_VD", \
     "DRV_VRDE_AUDIO", \
-    "DRV_VSWITCH",  \
-    "DRV_VUSB",     \
-    "EM",           \
-    "FTM",          \
-    "GIM",          \
-    "GMM",          \
+    "DRV_VSWITCH", \
+    "DRV_VUSB", \
+    "EM", \
+    "FTM", \
+    "GIM", \
+    "GMM", \
     "GUEST_CONTROL", \
-    "GUEST_DND",    \
-    "GUI",          \
-    "GVMM",         \
-    "HGCM",         \
-    "HGSMI",        \
-    "HM",           \
-    "IEM",          \
-    "IOBUFMGMT",    \
-    "IOM",          \
-    "IPC",          \
-    "LWIP",            \
-    "LWIP_API_LIB",    \
-    "LWIP_API_MSG",    \
-    "LWIP_ETHARP",     \
-    "LWIP_ICMP",       \
-    "LWIP_IGMP",       \
-    "LWIP_INET",       \
-    "LWIP_IP4",        \
-    "LWIP_IP4_REASS",  \
-    "LWIP_IP6",        \
-    "LWIP_MEM",        \
-    "LWIP_MEMP",       \
-    "LWIP_NETIF",      \
-    "LWIP_PBUF",       \
-    "LWIP_RAW",        \
-    "LWIP_SOCKETS",    \
-    "LWIP_SYS",        \
-    "LWIP_TCP",        \
-    "LWIP_TCPIP",      \
-    "LWIP_TCP_CWND",   \
-    "LWIP_TCP_FR",     \
-    "LWIP_TCP_INPUT",  \
+    "GUEST_DND", \
+    "GUI", \
+    "GVMM", \
+    "HGCM", \
+    "HGSMI", \
+    "HM", \
+    "IEM", \
+    "IOBUFMGMT", \
+    "IOM", \
+    "IPC", \
+    "LWIP", \
+    "LWIP_API_LIB", \
+    "LWIP_API_MSG", \
+    "LWIP_ETHARP", \
+    "LWIP_ICMP", \
+    "LWIP_IGMP", \
+    "LWIP_INET", \
+    "LWIP_IP4", \
+    "LWIP_IP4_REASS", \
+    "LWIP_IP6", \
+    "LWIP_MEM", \
+    "LWIP_MEMP", \
+    "LWIP_NETIF", \
+    "LWIP_PBUF", \
+    "LWIP_RAW", \
+    "LWIP_SOCKETS", \
+    "LWIP_SYS", \
+    "LWIP_TCP", \
+    "LWIP_TCP_CWND", \
+    "LWIP_TCP_FR", \
+    "LWIP_TCP_INPUT", \
     "LWIP_TCP_OUTPUT", \
-    "LWIP_TCP_QLEN",   \
-    "LWIP_TCP_RST",    \
-    "LWIP_TCP_RTO",    \
-    "LWIP_TCP_WND",    \
-    "LWIP_TIMERS",     \
-    "LWIP_UDP",        \
-    "MAIN",         \
+    "LWIP_TCP_QLEN", \
+    "LWIP_TCP_RST", \
+    "LWIP_TCP_RTO", \
+    "LWIP_TCP_WND", \
+    "LWIP_TCPIP", \
+    "LWIP_TIMERS", \
+    "LWIP_UDP", \
+    "MAIN", \
     "MAIN_ADDITIONSFACILITY", \
-    "MAIN_ADDITIONSSTATECHANGEDEVENT", \
     "MAIN_APPLIANCE", \
     "MAIN_AUDIOADAPTER", \
-    "MAIN_AUDIOADAPTERCHANGEDEVENT", \
     "MAIN_BANDWIDTHCONTROL", \
     "MAIN_BANDWIDTHGROUP", \
-    "MAIN_BANDWIDTHGROUPCHANGEDEVENT", \
     "MAIN_BIOSSETTINGS", \
     "MAIN_BOOLEANFORMVALUE", \
-    "MAIN_CANSHOWWINDOWEVENT", \
     "MAIN_CERTIFICATE", \
     "MAIN_CHOICEFORMVALUE", \
-    "MAIN_CLIPBOARDMODECHANGEDEVENT", \
     "MAIN_CLOUDCLIENT", \
     "MAIN_CLOUDPROFILE", \
@@ -1033,10 +888,6 @@
     "MAIN_CLOUDPROVIDERMANAGER", \
     "MAIN_CONSOLE", \
-    "MAIN_CPUCHANGEDEVENT", \
-    "MAIN_CPUEXECUTIONCAPCHANGEDEVENT", \
-    "MAIN_CURSORPOSITIONCHANGEDEVENT", \
-    "MAIN_GUESTMONITORINFOCHANGEDEVENT", \
     "MAIN_DATAMODEL", \
-    "MAIN_DATASTREASTREAM", \
+    "MAIN_DATASTREAM", \
     "MAIN_DHCPSERVER", \
     "MAIN_DIRECTORY", \
@@ -1044,12 +895,10 @@
     "MAIN_DISPLAYSOURCEBITMAP", \
     "MAIN_DNDBASE", \
-    "MAIN_DNDMODECHANGEDEVENT", \
     "MAIN_DNDSOURCE", \
     "MAIN_DNDTARGET", \
-    "MAIN_EMULATEDUSB",   \
-    "MAIN_EVENT",   \
+    "MAIN_EMULATEDUSB", \
+    "MAIN_EVENT", \
     "MAIN_EVENTLISTENER", \
     "MAIN_EVENTSOURCE", \
-    "MAIN_EVENTSOURCECHANGEDEVENT", \
     "MAIN_EXTPACK", \
     "MAIN_EXTPACKBASE", \
@@ -1057,7 +906,5 @@
     "MAIN_EXTPACKMANAGER", \
     "MAIN_EXTPACKPLUGIN", \
-    "MAIN_EXTRADATACANCHANGEEVENT", \
-    "MAIN_EXTRADATACHANGEDEVENT", \
-    "MAIN_FILE",    \
+    "MAIN_FILE", \
     "MAIN_FORM", \
     "MAIN_FORMVALUE", \
@@ -1065,5 +912,5 @@
     "MAIN_FRAMEBUFFEROVERLAY", \
     "MAIN_FSOBJINFO", \
-    "MAIN_GUEST",   \
+    "MAIN_GUEST", \
     "MAIN_GUESTDIRECTORY", \
     "MAIN_GUESTDNDSOURCE", \
@@ -1073,33 +920,14 @@
     "MAIN_GUESTFILEEVENT", \
     "MAIN_GUESTFILEIOEVENT", \
-    "MAIN_GUESTFILEOFFSETCHANGEDEVENT", \
-    "MAIN_GUESTFILEREADEVENT", \
-    "MAIN_GUESTFILEREGISTEREDEVENT", \
-    "MAIN_GUESTFILESTATECHANGEDEVENT", \
-    "MAIN_GUESTFILEWRITEEVENT", \
     "MAIN_GUESTFSOBJINFO", \
-    "MAIN_GUESTKEYBOARDEVENT", \
-    "MAIN_GUESTMONITORCHANGEDEVENT", \
-    "MAIN_GUESTMOUSEEVENT", \
-    "MAIN_GUESTMULTITOUCHEVENT", \
     "MAIN_GUESTOSTYPE", \
     "MAIN_GUESTPROCESS", \
     "MAIN_GUESTPROCESSEVENT", \
-    "MAIN_GUESTPROCESSINPUTNOTIFYEVENT", \
     "MAIN_GUESTPROCESSIOEVENT", \
-    "MAIN_GUESTPROCESSOUTPUTEVENT", \
-    "MAIN_GUESTPROCESSREGISTEREDEVENT", \
-    "MAIN_GUESTPROCESSSTATECHANGEDEVENT", \
-    "MAIN_GUESTPROPERTYCHANGEDEVENT", \
     "MAIN_GUESTSCREENINFO", \
     "MAIN_GUESTSESSION", \
     "MAIN_GUESTSESSIONEVENT", \
-    "MAIN_GUESTSESSIONREGISTEREDEVENT", \
-    "MAIN_GUESTSESSIONSTATECHANGEDEVENT", \
-    "MAIN_GUESTUSERSTATECHANGEDEVENT", \
     "MAIN_HOST", \
-    "MAIN_HOSTNAMERESOLUTIONCONFIGURATIONCHANGEEVENT", \
     "MAIN_HOSTNETWORKINTERFACE", \
-    "MAIN_HOSTPCIDEVICEPLUGEVENT", \
     "MAIN_HOSTUSBDEVICE", \
     "MAIN_HOSTUSBDEVICEFILTER", \
@@ -1108,35 +936,17 @@
     "MAIN_INTERNALSESSIONCONTROL", \
     "MAIN_KEYBOARD", \
-    "MAIN_KEYBOARDLEDSCHANGEDEVENT", \
     "MAIN_MACHINE", \
-    "MAIN_MACHINEDATACHANGEDEVENT", \
     "MAIN_MACHINEDEBUGGER", \
     "MAIN_MACHINEEVENT", \
-    "MAIN_MACHINEREGISTEREDEVENT", \
-    "MAIN_MACHINESTATECHANGEDEVENT", \
-    "MAIN_MEDIUM",  \
+    "MAIN_MEDIUM", \
     "MAIN_MEDIUMATTACHMENT", \
-    "MAIN_MEDIUMCHANGEDEVENT", \
-    "MAIN_MEDIUMCONFIGCHANGEDEVENT", \
     "MAIN_MEDIUMFORMAT", \
     "MAIN_MEDIUMIO", \
-    "MAIN_MEDIUMREGISTEREDEVENT", \
-    "MAIN_MOUSE",   \
-    "MAIN_MOUSECAPABILITYCHANGEDEVENT", \
+    "MAIN_MOUSE", \
     "MAIN_MOUSEPOINTERSHAPE", \
-    "MAIN_MOUSEPOINTERSHAPECHANGEDEVENT", \
     "MAIN_NATENGINE", \
     "MAIN_NATNETWORK", \
-    "MAIN_NATNETWORKALTEREVENT", \
-    "MAIN_NATNETWORKCHANGEDEVENT", \
-    "MAIN_NATNETWORKCREATIONDELETIONEVENT", \
-    "MAIN_NATNETWORKPORTFORWARDEVENT", \
-    "MAIN_NATNETWORKSETTINGEVENT", \
-    "MAIN_NATNETWORKSTARTSTOPEVENT", \
-    "MAIN_NATREDIRECTEVENT", \
     "MAIN_NETWORKADAPTER", \
-    "MAIN_NETWORKADAPTERCHANGEDEVENT", \
     "MAIN_PARALLELPORT", \
-    "MAIN_PARALLELPORTCHANGEDEVENT", \
     "MAIN_PCIADDRESS", \
     "MAIN_PCIDEVICEATTACHMENT", \
@@ -1146,29 +956,14 @@
     "MAIN_PROGRESS", \
     "MAIN_PROGRESSEVENT", \
-    "MAIN_PROGRESSPERCENTAGECHANGEDEVENT", \
-    "MAIN_PROGRESSTASKCOMPLETEDEVENT", \
     "MAIN_RANGEDINTEGERFORMVALUE", \
-    "MAIN_RECORDINGCHANGEDEVENT", \
+    "MAIN_RECORDINGSCREENSETTINGS", \
     "MAIN_RECORDINGSETTINGS", \
-    "MAIN_RECORDINGSCREENSETTINGS", \
     "MAIN_REUSABLEEVENT", \
-    "MAIN_RUNTIMEERROREVENT", \
     "MAIN_SERIALPORT", \
-    "MAIN_SERIALPORTCHANGEDEVENT", \
     "MAIN_SESSION", \
-    "MAIN_SESSIONSTATECHANGEDEVENT", \
     "MAIN_SHAREDFOLDER", \
-    "MAIN_SHAREDFOLDERCHANGEDEVENT", \
-    "MAIN_SHOWWINDOWEVENT", \
     "MAIN_SNAPSHOT", \
-    "MAIN_SNAPSHOTCHANGEDEVENT", \
-    "MAIN_SNAPSHOTDELETEDEVENT", \
     "MAIN_SNAPSHOTEVENT", \
-    "MAIN_SNAPSHOTRESTOREDEVENT", \
-    "MAIN_SNAPSHOTTAKENEVENT", \
-    "MAIN_STATECHANGEDEVENT", \
     "MAIN_STORAGECONTROLLER", \
-    "MAIN_STORAGECONTROLLERCHANGEDEVENT", \
-    "MAIN_STORAGEDEVICECHANGEDEVENT", \
     "MAIN_STRINGARRAY", \
     "MAIN_STRINGFORMVALUE", \
@@ -1178,12 +973,9 @@
     "MAIN_UNATTENDED", \
     "MAIN_USBCONTROLLER", \
-    "MAIN_USBCONTROLLERCHANGEDEVENT", \
     "MAIN_USBDEVICE", \
     "MAIN_USBDEVICEFILTER", \
     "MAIN_USBDEVICEFILTERS", \
-    "MAIN_USBDEVICESTATECHANGEDEVENT", \
     "MAIN_USBPROXYBACKEND", \
     "MAIN_VBOXSVC", \
-    "MAIN_VBOXSVCAVAILABILITYCHANGEDEVENT", \
     "MAIN_VETOEVENT", \
     "MAIN_VFSEXPLORER", \
@@ -1195,81 +987,79 @@
     "MAIN_VMMDEVINTERFACES", \
     "MAIN_VRDESERVER", \
-    "MAIN_VRDESERVERCHANGEDEVENT", \
     "MAIN_VRDESERVERINFO", \
-    "MAIN_VRDESERVERINFOCHANGEDEVENT", \
-    "MISC",         \
-    "MM",           \
-    "MM_HEAP",      \
-    "MM_HYPER",     \
-    "MM_HYPER_HEAP",\
-    "MM_PHYS",      \
-    "MM_POOL",      \
-    "NAT_SERVICE",  \
-    "NEM",          \
-    "NET_ADP_DRV",  \
-    "NET_FLT_DRV",  \
-    "NET_SERVICE",  \
-    "NET_SHAPER",   \
-    "PATM",         \
-    "PDM",          \
+    "MISC", \
+    "MM", \
+    "MM_HEAP", \
+    "MM_HYPER", \
+    "MM_HYPER_HEAP", \
+    "MM_PHYS", \
+    "MM_POOL", \
+    "NAT_SERVICE", \
+    "NEM", \
+    "NET_ADP_DRV", \
+    "NET_FLT_DRV", \
+    "NET_SERVICE", \
+    "NET_SHAPER", \
+    "PATM", \
+    "PDM", \
     "PDM_ASYNC_COMPLETION", \
     "PDM_BLK_CACHE", \
-    "PDM_DEVICE",   \
-    "PDM_DRIVER",   \
-    "PDM_LDR",      \
-    "PDM_QUEUE",    \
-    "PGM",          \
-    "PGM_DYNMAP",   \
-    "PGM_PHYS",     \
-    "PGM_PHYS_ACCESS",\
-    "PGM_POOL",     \
-    "PGM_SHARED",   \
-    "REM",          \
-    "REM_DISAS",    \
-    "REM_HANDLER",  \
-    "REM_IOPORT",   \
-    "REM_MMIO",     \
-    "REM_PRINTF",   \
-    "REM_RUN",      \
-    "SELM",         \
-    "SHARED_CLIPBOARD",\
-    "SHARED_CROPENGL",\
-    "SHARED_FOLDERS",\
-    "SHARED_OPENGL",\
-    "SRV_INTNET",   \
-    "SSM",          \
-    "STAM",         \
-    "SUP",          \
-    "SUP_DRV",      \
-    "TM",           \
-    "TRPM",         \
-    "USB_CARDREADER",\
-    "USB_DRV",      \
-    "USB_FILTER",   \
-    "USB_KBD",      \
-    "USB_MOUSE",    \
-    "USB_MSD",      \
-    "USB_REMOTE",   \
-    "USB_WEBCAM",   \
-    "VGDRV",        \
-    "VBGL",         \
-    "VD",           \
-    "VD_CUE",       \
-    "VD_DMG",       \
-    "VD_ISCSI",     \
+    "PDM_DEVICE", \
+    "PDM_DRIVER", \
+    "PDM_LDR", \
+    "PDM_QUEUE", \
+    "PGM", \
+    "PGM_DYNMAP", \
+    "PGM_PHYS", \
+    "PGM_PHYS_ACCESS", \
+    "PGM_POOL", \
+    "PGM_SHARED", \
+    "REM", \
+    "REM_DISAS", \
+    "REM_HANDLER", \
+    "REM_IOPORT", \
+    "REM_MMIO", \
+    "REM_PRINTF", \
+    "REM_RUN", \
+    "SELM", \
+    "SHARED_CLIPBOARD", \
+    "SHARED_CROPENGL", \
+    "SHARED_FOLDERS", \
+    "SHARED_OPENGL", \
+    "SRV_INTNET", \
+    "SSM", \
+    "STAM", \
+    "SUP", \
+    "SUP_DRV", \
+    "TM", \
+    "TRPM", \
+    "USB_CARDREADER", \
+    "USB_DRV", \
+    "USB_FILTER", \
+    "USB_KBD", \
+    "USB_MOUSE", \
+    "USB_MSD", \
+    "USB_REMOTE", \
+    "USB_WEBCAM", \
+    "VBGL", \
+    "VD", \
+    "VD_CUE", \
+    "VD_DMG", \
+    "VD_ISCSI", \
     "VD_PARALLELS", \
-    "VD_QCOW",      \
-    "VD_QED",       \
-    "VD_RAW",       \
-    "VD_VDI",       \
-    "VD_VHD",       \
-    "VD_VHDX",      \
-    "VD_VMDK",      \
-    "VM",           \
-    "VMM",          \
-    "VRDE",         \
-    "VRDP",         \
-    "VSCSI",        \
-    "WEBSERVICE",   \
+    "VD_QCOW", \
+    "VD_QED", \
+    "VD_RAW", \
+    "VD_VDI", \
+    "VD_VHD", \
+    "VD_VHDX", \
+    "VD_VMDK", \
+    "VGDRV", \
+    "VM", \
+    "VMM", \
+    "VRDE", \
+    "VRDP", \
+    "VSCSI", \
+    "WEBSERVICE", \
 }
 
Index: /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-log.h
===================================================================
--- /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-log.h	(revision 79521)
+++ /trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-log.h	(revision 79522)
@@ -87,5 +87,5 @@
 #  define LWIP_DEBUGF(_when, _args) \
      do { \
-         const VBOX_LOGGROUP _group = (_when) >> LWIP_DEBUGF_LOG_GROUP_SHIFT; \
+         const VBOXLOGGROUP _group = (_when) >> LWIP_DEBUGF_LOG_GROUP_SHIFT; \
          if (_group >= LOG_GROUP_DEFAULT) { \
              /* severe => l1; serious => l2; warning => l3; default => l4 */ \
@@ -102,3 +102,3 @@
 
 #endif /* LWIP_DEBUG */
-#endif /* __VBOX_LWIP_LOG_H__ */
+#endif /* !__VBOX_LWIP_LOG_H__ */
Index: /trunk/src/VBox/Runtime/VBox/log-vbox.cpp
===================================================================
--- /trunk/src/VBox/Runtime/VBox/log-vbox.cpp	(revision 79521)
+++ /trunk/src/VBox/Runtime/VBox/log-vbox.cpp	(revision 79522)
@@ -341,18 +341,10 @@
     ASSERT_LOG_GROUP(MAIN);
     ASSERT_LOG_GROUP(MAIN_ADDITIONSFACILITY);
-    ASSERT_LOG_GROUP(MAIN_ADDITIONSSTATECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_APPLIANCE);
     ASSERT_LOG_GROUP(MAIN_AUDIOADAPTER);
     ASSERT_LOG_GROUP(MAIN_BANDWIDTHCONTROL);
     ASSERT_LOG_GROUP(MAIN_BANDWIDTHGROUP);
-    ASSERT_LOG_GROUP(MAIN_BANDWIDTHGROUPCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_BIOSSETTINGS);
-    ASSERT_LOG_GROUP(MAIN_CANSHOWWINDOWEVENT);
-    ASSERT_LOG_GROUP(MAIN_CLIPBOARDMODECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_CONSOLE);
-    ASSERT_LOG_GROUP(MAIN_CPUCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_CPUEXECUTIONCAPCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_CURSORPOSITIONCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTMONITORINFOCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_DHCPSERVER);
     ASSERT_LOG_GROUP(MAIN_DIRECTORY);
@@ -360,5 +352,4 @@
     ASSERT_LOG_GROUP(MAIN_DISPLAYSOURCEBITMAP);
     ASSERT_LOG_GROUP(MAIN_DNDBASE);
-    ASSERT_LOG_GROUP(MAIN_DNDMODECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_DNDSOURCE);
     ASSERT_LOG_GROUP(MAIN_DNDTARGET);
@@ -367,5 +358,4 @@
     ASSERT_LOG_GROUP(MAIN_EVENTLISTENER);
     ASSERT_LOG_GROUP(MAIN_EVENTSOURCE);
-    ASSERT_LOG_GROUP(MAIN_EVENTSOURCECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_EXTPACK);
     ASSERT_LOG_GROUP(MAIN_EXTPACKBASE);
@@ -373,6 +363,4 @@
     ASSERT_LOG_GROUP(MAIN_EXTPACKMANAGER);
     ASSERT_LOG_GROUP(MAIN_EXTPACKPLUGIN);
-    ASSERT_LOG_GROUP(MAIN_EXTRADATACANCHANGEEVENT);
-    ASSERT_LOG_GROUP(MAIN_EXTRADATACHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_FILE);
     ASSERT_LOG_GROUP(MAIN_FRAMEBUFFER);
@@ -385,34 +373,10 @@
     ASSERT_LOG_GROUP(MAIN_GUESTERRORINFO);
     ASSERT_LOG_GROUP(MAIN_GUESTFILE);
-    ASSERT_LOG_GROUP(MAIN_GUESTFILEEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTFILEIOEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTFILEOFFSETCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTFILEREADEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTFILEREGISTEREDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTFILESTATECHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTFILEWRITEEVENT);
     ASSERT_LOG_GROUP(MAIN_GUESTFSOBJINFO);
-    ASSERT_LOG_GROUP(MAIN_GUESTKEYBOARDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTMONITORCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTMOUSEEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTMULTITOUCHEVENT);
     ASSERT_LOG_GROUP(MAIN_GUESTOSTYPE);
     ASSERT_LOG_GROUP(MAIN_GUESTPROCESS);
-    ASSERT_LOG_GROUP(MAIN_GUESTPROCESSEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTPROCESSINPUTNOTIFYEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTPROCESSIOEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTPROCESSOUTPUTEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTPROCESSREGISTEREDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTPROCESSSTATECHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTPROPERTYCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_GUESTSESSION);
-    ASSERT_LOG_GROUP(MAIN_GUESTSESSIONEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTSESSIONREGISTEREDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTSESSIONSTATECHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_GUESTUSERSTATECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_HOST);
-    ASSERT_LOG_GROUP(MAIN_HOSTNAMERESOLUTIONCONFIGURATIONCHANGEEVENT);
     ASSERT_LOG_GROUP(MAIN_HOSTNETWORKINTERFACE);
-    ASSERT_LOG_GROUP(MAIN_HOSTPCIDEVICEPLUGEVENT);
     ASSERT_LOG_GROUP(MAIN_HOSTUSBDEVICE);
     ASSERT_LOG_GROUP(MAIN_HOSTUSBDEVICEFILTER);
@@ -421,34 +385,15 @@
     ASSERT_LOG_GROUP(MAIN_INTERNALSESSIONCONTROL);
     ASSERT_LOG_GROUP(MAIN_KEYBOARD);
-    ASSERT_LOG_GROUP(MAIN_KEYBOARDLEDSCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_MACHINE);
-    ASSERT_LOG_GROUP(MAIN_MACHINEDATACHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_MACHINEDEBUGGER);
-    ASSERT_LOG_GROUP(MAIN_MACHINEEVENT);
-    ASSERT_LOG_GROUP(MAIN_MACHINEREGISTEREDEVENT);
-    ASSERT_LOG_GROUP(MAIN_MACHINESTATECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_MEDIUM);
     ASSERT_LOG_GROUP(MAIN_MEDIUMATTACHMENT);
-    ASSERT_LOG_GROUP(MAIN_MEDIUMCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_MEDIUMCONFIGCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_MEDIUMFORMAT);
-    ASSERT_LOG_GROUP(MAIN_MEDIUMREGISTEREDEVENT);
     ASSERT_LOG_GROUP(MAIN_MOUSE);
-    ASSERT_LOG_GROUP(MAIN_MOUSECAPABILITYCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_MOUSEPOINTERSHAPE);
-    ASSERT_LOG_GROUP(MAIN_MOUSEPOINTERSHAPECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_NATENGINE);
     ASSERT_LOG_GROUP(MAIN_NATNETWORK);
-    ASSERT_LOG_GROUP(MAIN_NATNETWORKALTEREVENT);
-    ASSERT_LOG_GROUP(MAIN_NATNETWORKCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_NATNETWORKCREATIONDELETIONEVENT);
-    ASSERT_LOG_GROUP(MAIN_NATNETWORKPORTFORWARDEVENT);
-    ASSERT_LOG_GROUP(MAIN_NATNETWORKSETTINGEVENT);
-    ASSERT_LOG_GROUP(MAIN_NATNETWORKSTARTSTOPEVENT);
-    ASSERT_LOG_GROUP(MAIN_NATREDIRECTEVENT);
     ASSERT_LOG_GROUP(MAIN_NETWORKADAPTER);
-    ASSERT_LOG_GROUP(MAIN_NETWORKADAPTERCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_PARALLELPORT);
-    ASSERT_LOG_GROUP(MAIN_PARALLELPORTCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_PCIADDRESS);
     ASSERT_LOG_GROUP(MAIN_PCIDEVICEATTACHMENT);
@@ -457,31 +402,14 @@
     ASSERT_LOG_GROUP(MAIN_PROCESS);
     ASSERT_LOG_GROUP(MAIN_PROGRESS);
-    ASSERT_LOG_GROUP(MAIN_REUSABLEEVENT);
-    ASSERT_LOG_GROUP(MAIN_RUNTIMEERROREVENT);
     ASSERT_LOG_GROUP(MAIN_SERIALPORT);
-    ASSERT_LOG_GROUP(MAIN_SERIALPORTCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_SESSION);
-    ASSERT_LOG_GROUP(MAIN_SESSIONSTATECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_SHAREDFOLDER);
-    ASSERT_LOG_GROUP(MAIN_SHAREDFOLDERCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_SHOWWINDOWEVENT);
     ASSERT_LOG_GROUP(MAIN_SNAPSHOT);
-    ASSERT_LOG_GROUP(MAIN_SNAPSHOTCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_SNAPSHOTDELETEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_SNAPSHOTEVENT);
-    ASSERT_LOG_GROUP(MAIN_SNAPSHOTRESTOREDEVENT);
-    ASSERT_LOG_GROUP(MAIN_SNAPSHOTTAKENEVENT);
-    ASSERT_LOG_GROUP(MAIN_STATECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_STORAGECONTROLLER);
-    ASSERT_LOG_GROUP(MAIN_STORAGECONTROLLERCHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_STORAGEDEVICECHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_SYSTEMPROPERTIES);
     ASSERT_LOG_GROUP(MAIN_TOKEN);
     ASSERT_LOG_GROUP(MAIN_USBCONTROLLER);
-    ASSERT_LOG_GROUP(MAIN_USBCONTROLLERCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_USBDEVICE);
     ASSERT_LOG_GROUP(MAIN_USBDEVICEFILTERS);
-    ASSERT_LOG_GROUP(MAIN_USBDEVICESTATECHANGEDEVENT);
-    ASSERT_LOG_GROUP(MAIN_VBOXSVCAVAILABILITYCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_VIRTUALBOX);
     ASSERT_LOG_GROUP(MAIN_VIRTUALBOXCLIENT);
@@ -489,7 +417,5 @@
     ASSERT_LOG_GROUP(MAIN_VIRTUALSYSTEMDESCRIPTION);
     ASSERT_LOG_GROUP(MAIN_VRDESERVER);
-    ASSERT_LOG_GROUP(MAIN_VRDESERVERCHANGEDEVENT);
     ASSERT_LOG_GROUP(MAIN_VRDESERVERINFO);
-    ASSERT_LOG_GROUP(MAIN_VRDESERVERINFOCHANGEDEVENT);
     ASSERT_LOG_GROUP(MISC);
     ASSERT_LOG_GROUP(MM);
