diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-01-01 20:13:07 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2019-01-01 20:13:07 +0000 |
| commit | fd40cef259ece463f0b9b8afa932627298001020 (patch) | |
| tree | 3e815c25c5a02f78b388eff8d6c94aa053646537 /src/VBox | |
| parent | bab1ece54275c4194ac417ef07d88fdc51d70606 (diff) | |
| download | VirtualBox-svn-fd40cef259ece463f0b9b8afa932627298001020.tar.gz | |
Main: Don't use Logging.h.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@76592 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox')
83 files changed, 207 insertions, 165 deletions
diff --git a/src/VBox/Main/glue/initterm.cpp b/src/VBox/Main/glue/initterm.cpp index 776a716e72e..bb7d1fcd2af 100644 --- a/src/VBox/Main/glue/initterm.cpp +++ b/src/VBox/Main/glue/initterm.cpp @@ -1,5 +1,4 @@ /* $Id$ */ - /** @file * MS COM / XPCOM Abstraction Layer - Initialization and Termination. */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #if !defined(VBOX_WITH_XPCOM) # include <iprt/nt/nt-and-windows.h> @@ -42,7 +42,7 @@ #include "VBox/com/NativeEventQueue.h" #include "VBox/com/AutoLock.h" -#include "../include/Logging.h" +#include "../include/LoggingNew.h" #include <iprt/asm.h> #include <iprt/env.h> diff --git a/src/VBox/Main/include/HostUSBDeviceImpl.h b/src/VBox/Main/include/HostUSBDeviceImpl.h index 34c87ea89c3..a16fea38fdf 100644 --- a/src/VBox/Main/include/HostUSBDeviceImpl.h +++ b/src/VBox/Main/include/HostUSBDeviceImpl.h @@ -24,7 +24,6 @@ #include "VirtualBoxBase.h" #include "USBDeviceFilterImpl.h" #include <VBox/usb.h> -#include "Logging.h" #include "HostUSBDeviceWrap.h" class SessionMachine; diff --git a/src/VBox/Main/include/LoggingNew.h b/src/VBox/Main/include/LoggingNew.h index 5bac699efbe..64c1e923c5e 100644 --- a/src/VBox/Main/include/LoggingNew.h +++ b/src/VBox/Main/include/LoggingNew.h @@ -36,6 +36,15 @@ #include <VBox/log.h> + +#ifndef VBOXSVC_LOG_DEFAULT +# define VBOXSVC_LOG_DEFAULT "all" +#endif + +#ifndef VBOXSDS_LOG_DEFAULT +# define VBOXSDS_LOG_DEFAULT "all" +#endif + #endif /* !MAIN_INCLUDED_LoggingNew_h */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/src-all/AuthLibrary.cpp b/src/VBox/Main/src-all/AuthLibrary.cpp index 05c7efe1bbf..13ba409da11 100644 --- a/src/VBox/Main/src-all/AuthLibrary.cpp +++ b/src/VBox/Main/src-all/AuthLibrary.cpp @@ -15,8 +15,9 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #include "AuthLibrary.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/err.h> #include <iprt/ldr.h> diff --git a/src/VBox/Main/src-all/AutoCaller.cpp b/src/VBox/Main/src-all/AutoCaller.cpp index 53608156fbc..80c5b6cd3d4 100644 --- a/src/VBox/Main/src-all/AutoCaller.cpp +++ b/src/VBox/Main/src-all/AutoCaller.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VirtualBox object state implementation */ @@ -17,11 +15,12 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #include <iprt/semaphore.h> #include "VirtualBoxBase.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-all/DisplayPNGUtil.cpp b/src/VBox/Main/src-all/DisplayPNGUtil.cpp index a1bef377680..cbbf2dab17d 100644 --- a/src/VBox/Main/src-all/DisplayPNGUtil.cpp +++ b/src/VBox/Main/src-all/DisplayPNGUtil.cpp @@ -15,7 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include "Logging.h" +#define LOG_GROUP LOG_GROUP_MAIN_DISPLAY #include "DisplayImpl.h" #include <iprt/alloc.h> diff --git a/src/VBox/Main/src-all/EventImpl.cpp b/src/VBox/Main/src-all/EventImpl.cpp index f9c345a9308..25f6a067b44 100644 --- a/src/VBox/Main/src-all/EventImpl.cpp +++ b/src/VBox/Main/src-all/EventImpl.cpp @@ -49,13 +49,14 @@ * waiters may never know that event processing finished. */ +#define LOG_GROUP LOG_GROUP_MAIN_EVENT #include <list> #include <map> #include <deque> #include "EventImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/asm.h> #include <iprt/critsect.h> diff --git a/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp b/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp index cfe579642be..543f7850ade 100644 --- a/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp +++ b/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * PCI attachment information implmentation. */ @@ -17,10 +15,11 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_PCIDEVICEATTACHMENT #include "PCIDeviceAttachmentImpl.h" #include "AutoCaller.h" #include "Global.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/settings.h> diff --git a/src/VBox/Main/src-all/ProgressImpl.cpp b/src/VBox/Main/src-all/ProgressImpl.cpp index 9d0eb59051a..6a0dfda988c 100644 --- a/src/VBox/Main/src-all/ProgressImpl.cpp +++ b/src/VBox/Main/src-all/ProgressImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox Progress COM class implementation */ @@ -16,9 +15,9 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_PROGRESS #include <iprt/types.h> - #if defined(VBOX_WITH_XPCOM) #include <nsIServiceManager.h> #include <nsIExceptionService.h> @@ -32,17 +31,17 @@ #endif #include "VirtualBoxErrorInfoImpl.h" -#include "Logging.h" - #include <iprt/time.h> #include <iprt/semaphore.h> #include <iprt/cpp/utils.h> #include <iprt/errcore.h> -#include "AutoCaller.h" +#include "AutoCaller.h" +#include "LoggingNew.h" #include "VBoxEvents.h" + Progress::Progress() #if !defined(VBOX_COM_INPROC) : mParent(NULL) diff --git a/src/VBox/Main/src-all/SharedFolderImpl.cpp b/src/VBox/Main/src-all/SharedFolderImpl.cpp index 2f8d6e672c3..455f5d90c86 100644 --- a/src/VBox/Main/src-all/SharedFolderImpl.cpp +++ b/src/VBox/Main/src-all/SharedFolderImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_SHAREDFOLDER #include "SharedFolderImpl.h" #if !defined(VBOX_COM_INPROC) # include "VirtualBoxImpl.h" @@ -24,7 +24,6 @@ #include "ConsoleImpl.h" #include "AutoCaller.h" -#include "Logging.h" #include <iprt/param.h> #include <iprt/cpp/utils.h> diff --git a/src/VBox/Main/src-all/VirtualBoxBase.cpp b/src/VBox/Main/src-all/VirtualBoxBase.cpp index 9b8cad94d99..5b4613155bd 100644 --- a/src/VBox/Main/src-all/VirtualBoxBase.cpp +++ b/src/VBox/Main/src-all/VirtualBoxBase.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VirtualBox COM base classes implementation */ @@ -17,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #include <iprt/semaphore.h> #include <iprt/asm.h> #include <iprt/cpp/exception.h> @@ -35,8 +34,8 @@ #include "VirtualBoxBase.h" #include "AutoCaller.h" #include "VirtualBoxErrorInfoImpl.h" -#include "Logging.h" #include "Global.h" +#include "LoggingNew.h" #include "VBox/com/ErrorInfo.h" #include "VBox/com/MultiResult.h" diff --git a/src/VBox/Main/src-all/VirtualBoxErrorInfoImpl.cpp b/src/VBox/Main/src-all/VirtualBoxErrorInfoImpl.cpp index 8c04f6fb906..8bf7bda8b48 100644 --- a/src/VBox/Main/src-all/VirtualBoxErrorInfoImpl.cpp +++ b/src/VBox/Main/src-all/VirtualBoxErrorInfoImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBoxErrorInfo COM class implementation */ @@ -16,8 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #include "VirtualBoxErrorInfoImpl.h" -#include "Logging.h" #include <VBox/com/ErrorInfo.h> diff --git a/src/VBox/Main/src-client/xpcom/module.cpp b/src/VBox/Main/src-client/xpcom/module.cpp index 9e385cbf86d..e0bc2065c30 100644 --- a/src/VBox/Main/src-client/xpcom/module.cpp +++ b/src/VBox/Main/src-client/xpcom/module.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * XPCOM module implementation functions */ @@ -16,6 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN + /* Make sure all the stdint.h macros are included - must come first! */ #ifndef __STDC_LIMIT_MACROS # define __STDC_LIMIT_MACROS @@ -34,8 +35,6 @@ #include "RemoteUSBDeviceImpl.h" #include "USBDeviceImpl.h" -#include "Logging.h" - // XPCOM glue code unfolding /* @@ -69,28 +68,35 @@ public: FinalRelease(); instance = 0; } + static nsresult GetInstance(VirtualBoxClient **inst) { int rv = NS_OK; if (instance == 0) { instance = new VirtualBoxClientClassFactory(); - if (instance) { + if (instance) + { instance->AddRef(); // protect FinalConstruct() rv = instance->FinalConstruct(); if (NS_FAILED(rv)) instance->Release(); else instance->AddRef(); // self-reference - } else { + } + else + { rv = NS_ERROR_OUT_OF_MEMORY; } - } else { + } + else + { instance->AddRef(); } *inst = instance; return rv; } + static nsresult FactoryDestructor() { if (instance) diff --git a/src/VBox/Main/src-global/win/VBoxSDS.cpp b/src/VBox/Main/src-global/win/VBoxSDS.cpp index be714f19f49..f30d8987b9e 100644 --- a/src/VBox/Main/src-global/win/VBoxSDS.cpp +++ b/src/VBox/Main/src-global/win/VBoxSDS.cpp @@ -78,6 +78,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_VIRTUALBOXSDS #include <iprt/win/windows.h> #include <iprt/win/shlobj.h> @@ -86,7 +87,7 @@ #include "VBox/com/VirtualBox.h" #include "VirtualBoxSDSImpl.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/errcore.h> #include <iprt/asm.h> diff --git a/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp b/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp index 356322299c7..4243f04e8ae 100644 --- a/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp +++ b/src/VBox/Main/src-global/win/VirtualBoxSDSImpl.cpp @@ -19,11 +19,12 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_VIRTUALBOXSDS #include <VBox/com/VirtualBox.h> #include "VirtualBoxSDSImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/errcore.h> #include <iprt/asm.h> diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp index c05ddd9865f..1b011efe85b 100644 --- a/src/VBox/Main/src-server/ApplianceImpl.cpp +++ b/src/VBox/Main/src-server/ApplianceImpl.cpp @@ -15,6 +15,11 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ + +/********************************************************************************************************************************* +* Header Files * +*********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_APPLIANCE #include <iprt/path.h> #include <iprt/cpp/utils.h> #include <VBox/com/array.h> @@ -29,7 +34,7 @@ #include "MachineImpl.h" #include "SystemPropertiesImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "CertificateImpl.h" #include "ApplianceImplPrivate.h" diff --git a/src/VBox/Main/src-server/ApplianceImplExport.cpp b/src/VBox/Main/src-server/ApplianceImplExport.cpp index dcd15be747c..5bdbbc9e2e1 100644 --- a/src/VBox/Main/src-server/ApplianceImplExport.cpp +++ b/src/VBox/Main/src-server/ApplianceImplExport.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_APPLIANCE #include <iprt/path.h> #include <iprt/dir.h> #include <iprt/param.h> @@ -30,12 +31,12 @@ #include "ProgressImpl.h" #include "MachineImpl.h" #include "MediumImpl.h" +#include "LoggingNew.h" #include "Global.h" #include "MediumFormatImpl.h" #include "SystemPropertiesImpl.h" #include "AutoCaller.h" -#include "Logging.h" #include "ApplianceImplPrivate.h" diff --git a/src/VBox/Main/src-server/ApplianceImplImport.cpp b/src/VBox/Main/src-server/ApplianceImplImport.cpp index db12634c62f..fa86f852291 100644 --- a/src/VBox/Main/src-server/ApplianceImplImport.cpp +++ b/src/VBox/Main/src-server/ApplianceImplImport.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_APPLIANCE #include <iprt/alloca.h> #include <iprt/path.h> #include <iprt/dir.h> @@ -44,7 +45,7 @@ #include "HostImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "ApplianceImplPrivate.h" #include "CertificateImpl.h" diff --git a/src/VBox/Main/src-server/AudioAdapterImpl.cpp b/src/VBox/Main/src-server/AudioAdapterImpl.cpp index 7061291b76b..9206c6f324f 100644 --- a/src/VBox/Main/src-server/AudioAdapterImpl.cpp +++ b/src/VBox/Main/src-server/AudioAdapterImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_AUDIOADAPTER #include "AudioAdapterImpl.h" #include "MachineImpl.h" @@ -25,7 +25,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" // constructor / destructor diff --git a/src/VBox/Main/src-server/BIOSSettingsImpl.cpp b/src/VBox/Main/src-server/BIOSSettingsImpl.cpp index edca1b67e8a..07fc4bcabb6 100644 --- a/src/VBox/Main/src-server/BIOSSettingsImpl.cpp +++ b/src/VBox/Main/src-server/BIOSSettingsImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation - Machine BIOS settings. */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_BIOSSETTINGS #include "BIOSSettingsImpl.h" #include "MachineImpl.h" #include "GuestOSTypeImpl.h" @@ -25,7 +25,8 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" + //////////////////////////////////////////////////////////////////////////////// // diff --git a/src/VBox/Main/src-server/BandwidthControlImpl.cpp b/src/VBox/Main/src-server/BandwidthControlImpl.cpp index 5e5ae71f066..b7c7e6700aa 100644 --- a/src/VBox/Main/src-server/BandwidthControlImpl.cpp +++ b/src/VBox/Main/src-server/BandwidthControlImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_BANDWIDTHCONTROL #include "BandwidthControlImpl.h" #include "BandwidthGroupImpl.h" #include "MachineImpl.h" @@ -23,7 +23,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/cpp/utils.h> #include <VBox/com/array.h> diff --git a/src/VBox/Main/src-server/BandwidthGroupImpl.cpp b/src/VBox/Main/src-server/BandwidthGroupImpl.cpp index 182e6cddac9..61d97123e80 100644 --- a/src/VBox/Main/src-server/BandwidthGroupImpl.cpp +++ b/src/VBox/Main/src-server/BandwidthGroupImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,12 +15,13 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_BANDWIDTHGROUP #include "BandwidthGroupImpl.h" #include "MachineImpl.h" #include "Global.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/cpp/utils.h> diff --git a/src/VBox/Main/src-server/CertificateImpl.cpp b/src/VBox/Main/src-server/CertificateImpl.cpp index a390556a963..256c898d507 100644 --- a/src/VBox/Main/src-server/CertificateImpl.cpp +++ b/src/VBox/Main/src-server/CertificateImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_CERTIFICATE #include <iprt/err.h> #include <iprt/path.h> #include <iprt/cpp/utils.h> @@ -25,7 +26,7 @@ #include "CertificateImpl.h" #include "AutoCaller.h" #include "Global.h" -#include "Logging.h" +#include "LoggingNew.h" using namespace std; diff --git a/src/VBox/Main/src-server/CloudProviderManagerImpl.cpp b/src/VBox/Main/src-server/CloudProviderManagerImpl.cpp index 02bc023d2c6..7662650828e 100644 --- a/src/VBox/Main/src-server/CloudProviderManagerImpl.cpp +++ b/src/VBox/Main/src-server/CloudProviderManagerImpl.cpp @@ -16,13 +16,14 @@ */ +#define LOG_GROUP LOG_GROUP_MAIN_CLOUDPROVIDERMANAGER #include <VBox/com/array.h> #include "VirtualBoxImpl.h" #include "CloudProviderManagerImpl.h" #include "ExtPackManagerImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-server/DHCPServerImpl.cpp b/src/VBox/Main/src-server/DHCPServerImpl.cpp index 717e589673b..9c4508c54ff 100644 --- a/src/VBox/Main/src-server/DHCPServerImpl.cpp +++ b/src/VBox/Main/src-server/DHCPServerImpl.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VirtualBox COM class implementation */ @@ -17,11 +15,11 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include <string> +#define LOG_GROUP LOG_GROUP_MAIN_DHCPSERVER #include "NetworkServiceRunner.h" #include "DHCPServerImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/asm.h> #include <iprt/file.h> diff --git a/src/VBox/Main/src-server/DataStreamImpl.cpp b/src/VBox/Main/src-server/DataStreamImpl.cpp index 6efe6a7f1ff..d9376087c2c 100644 --- a/src/VBox/Main/src-server/DataStreamImpl.cpp +++ b/src/VBox/Main/src-server/DataStreamImpl.cpp @@ -1,7 +1,6 @@ /* $Id$ */ /** @file - * - * VirtualBox COM class implementation: DataStream + * VirtualBox COM class implementation - DataStream */ /* @@ -20,10 +19,11 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_DATASTREAM #include "DataStreamImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/errcore.h> diff --git a/src/VBox/Main/src-server/GuestOSTypeImpl.cpp b/src/VBox/Main/src-server/GuestOSTypeImpl.cpp index 90646cc6bcf..d5b64905dff 100644 --- a/src/VBox/Main/src-server/GuestOSTypeImpl.cpp +++ b/src/VBox/Main/src-server/GuestOSTypeImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,9 +15,10 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_GUESTOSTYPE #include "GuestOSTypeImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/cpp/utils.h> // constructor / destructor diff --git a/src/VBox/Main/src-server/HostDnsService.cpp b/src/VBox/Main/src-server/HostDnsService.cpp index b3a8fc9be45..3a7a7b69700 100644 --- a/src/VBox/Main/src-server/HostDnsService.cpp +++ b/src/VBox/Main/src-server/HostDnsService.cpp @@ -15,13 +15,14 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include <VBox/com/array.h> #include <VBox/com/ptr.h> #include <VBox/com/string.h> #include <iprt/cpp/utils.h> -#include "Logging.h" +#include "LoggingNew.h" #include "VirtualBoxImpl.h" #include <iprt/time.h> #include <iprt/thread.h> diff --git a/src/VBox/Main/src-server/HostImpl.cpp b/src/VBox/Main/src-server/HostImpl.cpp index 99e2affdd4d..ea9fe59574e 100644 --- a/src/VBox/Main/src-server/HostImpl.cpp +++ b/src/VBox/Main/src-server/HostImpl.cpp @@ -15,6 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_HOST + #define __STDC_LIMIT_MACROS #define __STDC_CONSTANT_MACROS @@ -41,7 +43,7 @@ #include "HostVideoInputDeviceImpl.h" #include "MachineImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "Performance.h" #include "MediumImpl.h" diff --git a/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp b/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp index 812349ee63d..7d693b34a53 100644 --- a/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp +++ b/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VirtualBox COM class implementation */ @@ -16,14 +14,16 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ + +#define LOG_GROUP LOG_GROUP_MAIN_HOSTNETWORKINTERFACE #include "HostNetworkInterfaceImpl.h" #include "AutoCaller.h" -#include "Logging.h" #include "netif.h" #ifdef VBOX_WITH_RESOURCE_USAGE_API # include "Performance.h" # include "PerformanceImpl.h" #endif +#include "LoggingNew.h" #include <iprt/cpp/utils.h> diff --git a/src/VBox/Main/src-server/HostPower.cpp b/src/VBox/Main/src-server/HostPower.cpp index c735dfa428a..a2f2b0fd468 100644 --- a/src/VBox/Main/src-server/HostPower.cpp +++ b/src/VBox/Main/src-server/HostPower.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox interface to host's power notification service */ @@ -20,9 +19,9 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ - +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include "HostPower.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/com/ptr.h> diff --git a/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp b/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp index c84049808ba..b1e23ad3036 100644 --- a/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp +++ b/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp @@ -16,6 +16,7 @@ */ +#define LOG_GROUP LOG_GROUP_MAIN_HOSTUSBDEVICE #include <iprt/types.h> /* for UINT64_C */ #include "HostUSBDeviceImpl.h" @@ -24,9 +25,9 @@ #include "VirtualBoxErrorInfoImpl.h" #include "USBProxyBackend.h" #include "USBIdDatabase.h" +#include "LoggingNew.h" #include "AutoCaller.h" -#include "Logging.h" #include <VBox/err.h> #include <iprt/cpp/utils.h> diff --git a/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp b/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp index 4991569ea99..4d0c1706555 100644 --- a/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp +++ b/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp @@ -15,9 +15,9 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - +#define LOG_GROUP LOG_GROUP_MAIN_HOSTVIDEOINPUTDEVICE #include "HostVideoInputDeviceImpl.h" -#include "Logging.h" +#include "LoggingNew.h" #include "VirtualBoxImpl.h" #ifdef VBOX_WITH_EXTPACK # include "ExtPackManagerImpl.h" diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp index 8c7d4e77de4..8d87ecb12a2 100644 --- a/src/VBox/Main/src-server/MachineImpl.cpp +++ b/src/VBox/Main/src-server/MachineImpl.cpp @@ -15,6 +15,8 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_MACHINE + /* Make sure all the stdint.h macros are included - must come first! */ #ifndef __STDC_LIMIT_MACROS # define __STDC_LIMIT_MACROS @@ -23,7 +25,7 @@ # define __STDC_CONSTANT_MACROS #endif -#include "Logging.h" +#include "LoggingNew.h" #include "VirtualBoxImpl.h" #include "MachineImpl.h" #include "ClientToken.h" diff --git a/src/VBox/Main/src-server/MachineImplMoveVM.cpp b/src/VBox/Main/src-server/MachineImplMoveVM.cpp index e65ff1dbc53..ad2a2173896 100644 --- a/src/VBox/Main/src-server/MachineImplMoveVM.cpp +++ b/src/VBox/Main/src-server/MachineImplMoveVM.cpp @@ -14,6 +14,8 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ + +#define LOG_GROUP LOG_GROUP_MAIN_MACHINE #include <iprt/fs.h> #include <iprt/dir.h> #include <iprt/file.h> @@ -25,7 +27,7 @@ #include "MachineImplMoveVM.h" #include "MediumFormatImpl.h" #include "VirtualBoxImpl.h" -#include "Logging.h" +#include "LoggingNew.h" /** @todo r=klaus this file is abusing the release log by putting pretty much * everything there. Should be adjusted to use debug logging where appropriate diff --git a/src/VBox/Main/src-server/Matching.cpp b/src/VBox/Main/src-server/Matching.cpp index 922c80bc7e3..96b9a378e20 100644 --- a/src/VBox/Main/src-server/Matching.cpp +++ b/src/VBox/Main/src-server/Matching.cpp @@ -1,5 +1,6 @@ /* $Id$ */ /** @file + * @todo r=bird: brief description, please. * * Definition of template classes that provide simple API to * do matching between values and value filters constructed from strings. @@ -17,9 +18,10 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #include "Matching.h" -#include "Logging.h" +#include "LoggingNew.h" #include <stdlib.h> diff --git a/src/VBox/Main/src-server/MediumAttachmentImpl.cpp b/src/VBox/Main/src-server/MediumAttachmentImpl.cpp index 05415106008..044db5de6e6 100644 --- a/src/VBox/Main/src-server/MediumAttachmentImpl.cpp +++ b/src/VBox/Main/src-server/MediumAttachmentImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,13 +15,14 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_MEDIUMATTACHMENT #include "MediumAttachmentImpl.h" #include "MachineImpl.h" #include "MediumImpl.h" #include "Global.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/cpp/utils.h> diff --git a/src/VBox/Main/src-server/MediumFormatImpl.cpp b/src/VBox/Main/src-server/MediumFormatImpl.cpp index 68c93c5b79b..c85782b3263 100644 --- a/src/VBox/Main/src-server/MediumFormatImpl.cpp +++ b/src/VBox/Main/src-server/MediumFormatImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * MediumFormat COM class implementation */ @@ -16,9 +15,10 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_MEDIUMFORMAT #include "MediumFormatImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/vd.h> diff --git a/src/VBox/Main/src-server/MediumIOImpl.cpp b/src/VBox/Main/src-server/MediumIOImpl.cpp index 6ac532f2124..915068518d1 100644 --- a/src/VBox/Main/src-server/MediumIOImpl.cpp +++ b/src/VBox/Main/src-server/MediumIOImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation: MediumIO */ @@ -20,6 +19,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_MEDIUMIO #include "MediumIOImpl.h" #include "MediumImpl.h" #include "MediumLock.h" @@ -29,7 +29,7 @@ #include "VirtualBoxImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "ThreadTask.h" #include <iprt/fsvfs.h> diff --git a/src/VBox/Main/src-server/MediumImpl.cpp b/src/VBox/Main/src-server/MediumImpl.cpp index 73eb2e0de69..4ea4fb89f55 100644 --- a/src/VBox/Main/src-server/MediumImpl.cpp +++ b/src/VBox/Main/src-server/MediumImpl.cpp @@ -14,6 +14,8 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ + +#define LOG_GROUP LOG_GROUP_MAIN_MEDIUM #include "MediumImpl.h" #include "MediumIOImpl.h" #include "TokenImpl.h" @@ -23,7 +25,7 @@ #include "ExtPackManagerImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "ThreadTask.h" #include "VBox/com/MultiResult.h" #include "VBox/com/ErrorInfo.h" diff --git a/src/VBox/Main/src-server/NATEngineImpl.cpp b/src/VBox/Main/src-server/NATEngineImpl.cpp index 1074deb1316..285cf920957 100644 --- a/src/VBox/Main/src-server/NATEngineImpl.cpp +++ b/src/VBox/Main/src-server/NATEngineImpl.cpp @@ -15,9 +15,10 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_NATENGINE #include "NATEngineImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "MachineImpl.h" #include <iprt/string.h> diff --git a/src/VBox/Main/src-server/NATNetworkImpl.cpp b/src/VBox/Main/src-server/NATNetworkImpl.cpp index 630d0c97e77..b9ad777fd3f 100644 --- a/src/VBox/Main/src-server/NATNetworkImpl.cpp +++ b/src/VBox/Main/src-server/NATNetworkImpl.cpp @@ -15,12 +15,11 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -#include <string> +#define LOG_GROUP LOG_GROUP_MAIN_NATNETWORK #include "NetworkServiceRunner.h" #include "DHCPServerImpl.h" #include "NATNetworkImpl.h" #include "AutoCaller.h" -#include "Logging.h" #include <iprt/asm.h> #include <iprt/cpp/utils.h> @@ -31,6 +30,7 @@ #include <VBox/settings.h> #include "EventImpl.h" +#include "LoggingNew.h" #include "VirtualBoxImpl.h" #include <algorithm> diff --git a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp index 0619ab79c5a..fddf5ede62b 100644 --- a/src/VBox/Main/src-server/NetworkAdapterImpl.cpp +++ b/src/VBox/Main/src-server/NetworkAdapterImpl.cpp @@ -15,10 +15,11 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_NETWORKADAPTER #include "NetworkAdapterImpl.h" #include "NATEngineImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "MachineImpl.h" #include "GuestOSTypeImpl.h" #include "HostImpl.h" diff --git a/src/VBox/Main/src-server/ParallelPortImpl.cpp b/src/VBox/Main/src-server/ParallelPortImpl.cpp index b697793969d..7d41e66330c 100644 --- a/src/VBox/Main/src-server/ParallelPortImpl.cpp +++ b/src/VBox/Main/src-server/ParallelPortImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_PARALLELPORT #include "ParallelPortImpl.h" #include "MachineImpl.h" #include "VirtualBoxImpl.h" @@ -26,7 +27,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" //////////////////////////////////////////////////////////////////////////////// // diff --git a/src/VBox/Main/src-server/Performance.cpp b/src/VBox/Main/src-server/Performance.cpp index b5c7e5cdb85..5a9846a2750 100644 --- a/src/VBox/Main/src-server/Performance.cpp +++ b/src/VBox/Main/src-server/Performance.cpp @@ -15,17 +15,18 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ -/* +/** * @todo list: * * 1) Detection of erroneous metric names */ +#define LOG_GROUP LOG_GROUP_MAIN_PERFORMANCECOLLECTOR #ifndef VBOX_COLLECTOR_TEST_CASE -#include "VirtualBoxImpl.h" -#include "MachineImpl.h" -#include "MediumImpl.h" -#include "AutoCaller.h" +# include "VirtualBoxImpl.h" +# include "MachineImpl.h" +# include "MediumImpl.h" +# include "AutoCaller.h" #endif #include "Performance.h" #include "HostNetworkInterfaceImpl.h" diff --git a/src/VBox/Main/src-server/PerformanceImpl.cpp b/src/VBox/Main/src-server/PerformanceImpl.cpp index cf05400d2a7..d5e759d9299 100644 --- a/src/VBox/Main/src-server/PerformanceImpl.cpp +++ b/src/VBox/Main/src-server/PerformanceImpl.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VBox Performance API COM Classes implementation */ @@ -31,10 +29,11 @@ * 5) Pre-collection methods cannot modify metric data. */ +#define LOG_GROUP LOG_GROUP_MAIN_PERFORMANCECOLLECTOR #include "PerformanceImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/process.h> diff --git a/src/VBox/Main/src-server/ProgressProxyImpl.cpp b/src/VBox/Main/src-server/ProgressProxyImpl.cpp index a697f6dad68..68dfcc7c7bf 100644 --- a/src/VBox/Main/src-server/ProgressProxyImpl.cpp +++ b/src/VBox/Main/src-server/ProgressProxyImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_PROGRESS #include <iprt/types.h> #include "ProgressProxyImpl.h" @@ -22,11 +23,10 @@ #include "VirtualBoxImpl.h" #include "VirtualBoxErrorInfoImpl.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/time.h> #include <iprt/semaphore.h> - #include <iprt/errcore.h> //////////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-server/SerialPortImpl.cpp b/src/VBox/Main/src-server/SerialPortImpl.cpp index 9682ab2980f..5df888cd7f1 100644 --- a/src/VBox/Main/src-server/SerialPortImpl.cpp +++ b/src/VBox/Main/src-server/SerialPortImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_SERIALPORT #include "SerialPortImpl.h" #include "MachineImpl.h" #include "VirtualBoxImpl.h" @@ -29,7 +29,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" ////////////////////////////////////////////////////////////////////////////////// // diff --git a/src/VBox/Main/src-server/SnapshotImpl.cpp b/src/VBox/Main/src-server/SnapshotImpl.cpp index 277c1f95c7e..4f593108ff9 100644 --- a/src/VBox/Main/src-server/SnapshotImpl.cpp +++ b/src/VBox/Main/src-server/SnapshotImpl.cpp @@ -15,11 +15,12 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_SNAPSHOT #include <set> #include <map> -#include "Logging.h" #include "SnapshotImpl.h" +#include "LoggingNew.h" #include "MachineImpl.h" #include "MediumImpl.h" diff --git a/src/VBox/Main/src-server/StorageControllerImpl.cpp b/src/VBox/Main/src-server/StorageControllerImpl.cpp index bb4f622238e..4c39061663c 100644 --- a/src/VBox/Main/src-server/StorageControllerImpl.cpp +++ b/src/VBox/Main/src-server/StorageControllerImpl.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * Implementation of IStorageController. */ @@ -17,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_STORAGECONTROLLER #include "StorageControllerImpl.h" #include "MachineImpl.h" #include "VirtualBoxImpl.h" @@ -32,7 +31,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" // defines ///////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp index 93e79f9e061..c30891fac77 100644 --- a/src/VBox/Main/src-server/SystemPropertiesImpl.cpp +++ b/src/VBox/Main/src-server/SystemPropertiesImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_SYSTEMPROPERTIES #include "SystemPropertiesImpl.h" #include "VirtualBoxImpl.h" #include "MachineImpl.h" @@ -23,7 +24,7 @@ #endif #include "AutoCaller.h" #include "Global.h" -#include "Logging.h" +#include "LoggingNew.h" #include "AutostartDb.h" // generated header diff --git a/src/VBox/Main/src-server/TokenImpl.cpp b/src/VBox/Main/src-server/TokenImpl.cpp index 599ce266e08..7600e001892 100644 --- a/src/VBox/Main/src-server/TokenImpl.cpp +++ b/src/VBox/Main/src-server/TokenImpl.cpp @@ -1,7 +1,6 @@ /* $Id$ */ /** @file - * - * Token COM class implementation: MachineToken and MediumLockToken + * Token COM class implementation - MachineToken and MediumLockToken */ /* @@ -16,11 +15,12 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_TOKEN #include "TokenImpl.h" #include "MachineImpl.h" #include "MediumImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" // constructor / destructor ///////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-server/USBControllerImpl.cpp b/src/VBox/Main/src-server/USBControllerImpl.cpp index dfc0d43322a..dd6b16566ed 100644 --- a/src/VBox/Main/src-server/USBControllerImpl.cpp +++ b/src/VBox/Main/src-server/USBControllerImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_USBCONTROLLER #include "USBControllerImpl.h" #include "Global.h" @@ -33,7 +34,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" // defines ///////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp b/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp index e0f8a5e75fe..d1d2d4b6600 100644 --- a/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp +++ b/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_USBDEVICEFILTER #include "USBDeviceFilterImpl.h" #include "USBDeviceFiltersImpl.h" #include "MachineImpl.h" @@ -25,7 +26,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" //////////////////////////////////////////////////////////////////////////////// // Internal Helpers diff --git a/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp b/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp index 59bf464f7fc..8949525acf8 100644 --- a/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp +++ b/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_USBDEVICEFILTERS #include "USBDeviceFiltersImpl.h" #include "Global.h" @@ -39,7 +40,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" // defines ///////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-server/USBProxyBackend.cpp b/src/VBox/Main/src-server/USBProxyBackend.cpp index 364b4b3b636..abd7b805fa7 100644 --- a/src/VBox/Main/src-server/USBProxyBackend.cpp +++ b/src/VBox/Main/src-server/USBProxyBackend.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyBackend.h" #include "USBProxyService.h" #include "HostUSBDeviceImpl.h" @@ -23,7 +24,7 @@ #include "VirtualBoxImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/com/array.h> #include <iprt/errcore.h> diff --git a/src/VBox/Main/src-server/USBProxyService.cpp b/src/VBox/Main/src-server/USBProxyService.cpp index b4e5423f4ba..5d1be087867 100644 --- a/src/VBox/Main/src-server/USBProxyService.cpp +++ b/src/VBox/Main/src-server/USBProxyService.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyService.h" #include "HostUSBDeviceImpl.h" #include "HostImpl.h" @@ -22,7 +23,7 @@ #include "VirtualBoxImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/com/array.h> #include <iprt/errcore.h> diff --git a/src/VBox/Main/src-server/VFSExplorerImpl.cpp b/src/VBox/Main/src-server/VFSExplorerImpl.cpp index 590c5f6e711..da2dba3d5a7 100644 --- a/src/VBox/Main/src-server/VFSExplorerImpl.cpp +++ b/src/VBox/Main/src-server/VFSExplorerImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_VFSEXPLORER #include <iprt/dir.h> #include <iprt/path.h> #include <iprt/file.h> @@ -31,7 +32,7 @@ #include "ProgressImpl.h" #include "AutoCaller.h" -#include "Logging.h" +#include "LoggingNew.h" #include "ThreadTask.h" #include <memory> diff --git a/src/VBox/Main/src-server/VRDEServerImpl.cpp b/src/VBox/Main/src-server/VRDEServerImpl.cpp index bd37aee2cb5..d615f8042ad 100644 --- a/src/VBox/Main/src-server/VRDEServerImpl.cpp +++ b/src/VBox/Main/src-server/VRDEServerImpl.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox COM class implementation */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_VRDESERVER #include "VRDEServerImpl.h" #include "MachineImpl.h" #include "VirtualBoxImpl.h" @@ -37,7 +37,7 @@ #include "AutoStateDep.h" #include "AutoCaller.h" #include "Global.h" -#include "Logging.h" +#include "LoggingNew.h" // defines ///////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Main/src-server/VirtualBoxImpl.cpp b/src/VBox/Main/src-server/VirtualBoxImpl.cpp index d39549784e9..135cce6406a 100644 --- a/src/VBox/Main/src-server/VirtualBoxImpl.cpp +++ b/src/VBox/Main/src-server/VirtualBoxImpl.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_VIRTUALBOX #include <iprt/asm.h> #include <iprt/base64.h> #include <iprt/buildconfig.h> @@ -77,11 +78,10 @@ #endif #include "AutostartDb.h" #include "ClientWatcher.h" - #include "AutoCaller.h" -#include "Logging.h" - -# include "CloudProviderManagerImpl.h" +#include "LoggingNew.h" +#include "CloudProviderManagerImpl.h" +#include "ThreadTask.h" #include <QMTranslator.h> @@ -90,7 +90,6 @@ # include "tchar.h" #endif -#include "ThreadTask.h" //////////////////////////////////////////////////////////////////////////////// // diff --git a/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp b/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp index 73068799684..46534035114 100644 --- a/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp @@ -15,8 +15,9 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include "HostPower.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/errcore.h> #include <IOKit/IOMessage.h> diff --git a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp index 1ba0763e5f3..bd63f50851b 100644 --- a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp +++ b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp @@ -20,6 +20,8 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_HOST + /* * Deal with conflicts first. * PVM - BSD mess, that FreeBSD has correct a long time ago. @@ -51,7 +53,7 @@ #include "HostNetworkInterfaceImpl.h" #include "netif.h" #include "iokit.h" -#include "Logging.h" +#include "LoggingNew.h" #if 0 int NetIfList(std::list <ComObjPtr<HostNetworkInterface> > &list) diff --git a/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp b/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp index 101734c0aa0..7f5e316344b 100644 --- a/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp @@ -19,8 +19,9 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyBackend.h" -#include "Logging.h" +#include "LoggingNew.h" #include "iokit.h" #include <VBox/usb.h> diff --git a/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp b/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp index f2f32187fd6..c15b74a29a4 100644 --- a/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp +++ b/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp @@ -24,7 +24,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -#define LOG_GROUP LOG_GROUP_MAIN +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include <sys/types.h> #include <sys/sysctl.h> @@ -53,7 +53,7 @@ #include "HostNetworkInterfaceImpl.h" #include "netif.h" -#include "Logging.h" +#include "LoggingNew.h" #define ROUNDUP(a) \ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) diff --git a/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp b/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp index ef17a928702..9a77d2bbedf 100644 --- a/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp +++ b/src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp @@ -19,8 +19,9 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyBackend.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/usb.h> #include <VBox/usblib.h> @@ -47,15 +48,6 @@ #include <dev/usb/usb_ioctl.h> -/********************************************************************************************************************************* -* Structures and Typedefs * -*********************************************************************************************************************************/ - - -/********************************************************************************************************************************* -* Global Variables * -*********************************************************************************************************************************/ - /** * Initialize data members. */ diff --git a/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp b/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp index e20576b1a77..9d54c5f8ea8 100644 --- a/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp +++ b/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp @@ -19,9 +19,10 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyService.h" #include "USBGetDevices.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/usb.h> #include <VBox/usblib.h> diff --git a/src/VBox/Main/src-server/linux/HostPowerLinux.cpp b/src/VBox/Main/src-server/linux/HostPowerLinux.cpp index b73bfc62e36..f6796b0537a 100644 --- a/src/VBox/Main/src-server/linux/HostPowerLinux.cpp +++ b/src/VBox/Main/src-server/linux/HostPowerLinux.cpp @@ -1,5 +1,5 @@ +/* $Id$ */ /** @file - * * VirtualBox interface to host's power notification service */ @@ -15,8 +15,9 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include "HostPower.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/asm.h> #include <iprt/power.h> diff --git a/src/VBox/Main/src-server/linux/NetIf-linux.cpp b/src/VBox/Main/src-server/linux/NetIf-linux.cpp index 9418217dcd2..31e57630045 100644 --- a/src/VBox/Main/src-server/linux/NetIf-linux.cpp +++ b/src/VBox/Main/src-server/linux/NetIf-linux.cpp @@ -20,7 +20,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -#define LOG_GROUP LOG_GROUP_MAIN +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include <iprt/errcore.h> #include <list> @@ -36,7 +36,7 @@ #include "HostNetworkInterfaceImpl.h" #include "netif.h" -#include "Logging.h" +#include "LoggingNew.h" /** * Obtain the name of the interface used for default routing. diff --git a/src/VBox/Main/src-server/linux/PerformanceLinux.cpp b/src/VBox/Main/src-server/linux/PerformanceLinux.cpp index 82d97a16b25..fc8e0dd0b09 100644 --- a/src/VBox/Main/src-server/linux/PerformanceLinux.cpp +++ b/src/VBox/Main/src-server/linux/PerformanceLinux.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VBox Linux-specific Performance Classes implementation. */ @@ -17,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_PERFORMANCECOLLECTOR #include <stdio.h> #include <unistd.h> #include <sys/statvfs.h> @@ -36,7 +35,7 @@ #include <map> #include <vector> -#include "Logging.h" +#include "LoggingNew.h" #include "Performance.h" #define VBOXVOLINFO_NAME "VBoxVolInfo" diff --git a/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp b/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp index fe074eb1115..98029e0decb 100644 --- a/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp +++ b/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp @@ -19,9 +19,10 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyService.h" #include "USBGetDevices.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/usb.h> #include <VBox/usblib.h> diff --git a/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp b/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp index 4b52a666f83..a340bf1094a 100644 --- a/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp +++ b/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp @@ -19,10 +19,11 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #define INCL_BASE #define INCL_ERRORS #include "USBProxyBackend.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/usb.h> #include <iprt/errcore.h> diff --git a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp index c1acfd0d2b2..af3632a6d5f 100644 --- a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp +++ b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp @@ -20,7 +20,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -#define LOG_GROUP LOG_GROUP_MAIN +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include <iprt/errcore.h> #include <iprt/ctype.h> @@ -28,7 +28,7 @@ #include <iprt/path.h> #include <list> -#include "Logging.h" +#include "LoggingNew.h" #include "HostNetworkInterfaceImpl.h" #include "netif.h" diff --git a/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp b/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp index 101308a2745..adfc7ea6db7 100644 --- a/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VBox Solaris-specific Performance Classes implementation. */ @@ -17,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_PERFORMANCECOLLECTOR #undef _FILE_OFFSET_BITS #include <procfs.h> #include <stdio.h> @@ -37,7 +36,7 @@ #include <iprt/path.h> #include <iprt/system.h> -#include "Logging.h" +#include "LoggingNew.h" #include "Performance.h" #include <dlfcn.h> diff --git a/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp b/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp index 2ed671869e7..f0145160b45 100644 --- a/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp @@ -19,8 +19,9 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyBackend.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/usb.h> #include <VBox/usblib.h> diff --git a/src/VBox/Main/src-server/win/HostPowerWin.cpp b/src/VBox/Main/src-server/win/HostPowerWin.cpp index eb81026e10c..17f8c24d9d3 100644 --- a/src/VBox/Main/src-server/win/HostPowerWin.cpp +++ b/src/VBox/Main/src-server/win/HostPowerWin.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * VirtualBox interface to host's power notification service */ @@ -20,6 +19,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_HOST #include <iprt/win/windows.h> /* Some SDK versions lack the extern "C" and thus cause linking failures. * This workaround isn't pretty, but there are not many options. */ @@ -30,7 +30,7 @@ extern "C" { #include <VBox/com/ptr.h> #include <iprt/errcore.h> #include "HostPower.h" -#include "Logging.h" +#include "LoggingNew.h" /********************************************************************************************************************************* diff --git a/src/VBox/Main/src-server/win/NetIf-win.cpp b/src/VBox/Main/src-server/win/NetIf-win.cpp index f883e6ee026..4803ffd210f 100644 --- a/src/VBox/Main/src-server/win/NetIf-win.cpp +++ b/src/VBox/Main/src-server/win/NetIf-win.cpp @@ -20,7 +20,7 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -#define LOG_GROUP LOG_GROUP_MAIN +#define LOG_GROUP LOG_GROUP_MAIN_HOST #define NETIF_WITHOUT_NETCFG @@ -41,7 +41,7 @@ #include <iprt/win/iphlpapi.h> #include <iprt/win/ntddndis.h> -#include "Logging.h" +#include "LoggingNew.h" #include "HostNetworkInterfaceImpl.h" #include "ProgressImpl.h" #include "VirtualBoxImpl.h" diff --git a/src/VBox/Main/src-server/win/PerformanceWin.cpp b/src/VBox/Main/src-server/win/PerformanceWin.cpp index 41e4608fc28..325bac13383 100644 --- a/src/VBox/Main/src-server/win/PerformanceWin.cpp +++ b/src/VBox/Main/src-server/win/PerformanceWin.cpp @@ -1,7 +1,5 @@ /* $Id$ */ - /** @file - * * VBox Windows-specific Performance Classes implementation. */ @@ -17,12 +15,13 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_PERFORMANCECOLLECTOR #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 +# define _WIN32_WINNT 0x0500 #else /* !_WIN32_WINNT */ -#if (_WIN32_WINNT < 0x0500) -#error Win XP or later required! -#endif /* _WIN32_WINNT < 0x0500 */ +# if (_WIN32_WINNT < 0x0500) +# error Win XP or later required! +# endif /* _WIN32_WINNT < 0x0500 */ #endif /* !_WIN32_WINNT */ #include <iprt/win/windows.h> @@ -40,7 +39,7 @@ extern "C" { #include <map> -#include "Logging.h" +#include "LoggingNew.h" #include "Performance.h" #ifndef NT_ERROR diff --git a/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp b/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp index 081350904f6..c5885c7ae29 100644 --- a/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp +++ b/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp @@ -19,8 +19,9 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ +#define LOG_GROUP LOG_GROUP_MAIN_USBPROXYBACKEND #include "USBProxyBackend.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/usb.h> #include <iprt/errcore.h> diff --git a/src/VBox/Main/src-server/win/svchlp.cpp b/src/VBox/Main/src-server/win/svchlp.cpp index 0a1a9f0bd8b..1b8a5be49a2 100644 --- a/src/VBox/Main/src-server/win/svchlp.cpp +++ b/src/VBox/Main/src-server/win/svchlp.cpp @@ -15,15 +15,15 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #include "svchlp.h" //#include "HostImpl.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/errcore.h> -int netIfNetworkInterfaceHelperServer (SVCHlpClient *aClient, - SVCHlpMsg::Code aMsgCode); +int netIfNetworkInterfaceHelperServer(SVCHlpClient *aClient, SVCHlpMsg::Code aMsgCode); using namespace com; diff --git a/src/VBox/Main/src-server/win/svcmain.cpp b/src/VBox/Main/src-server/win/svcmain.cpp index 35683db01d9..bd64f71887c 100644 --- a/src/VBox/Main/src-server/win/svcmain.cpp +++ b/src/VBox/Main/src-server/win/svcmain.cpp @@ -19,7 +19,8 @@ /********************************************************************************************************************************* * Header Files * *********************************************************************************************************************************/ -# include <iprt/win/windows.h> +#define LOG_GROUP LOG_GROUP_MAIN_VBOXSVC +#include <iprt/win/windows.h> #ifdef DEBUG_bird # include <RpcAsync.h> #endif @@ -29,7 +30,7 @@ #include "VBox/com/VirtualBox.h" #include "VirtualBoxImpl.h" -#include "Logging.h" +#include "LoggingNew.h" #include "svchlp.h" diff --git a/src/VBox/Main/src-server/xpcom/server.cpp b/src/VBox/Main/src-server/xpcom/server.cpp index 6f8996466d2..e583368f5ec 100644 --- a/src/VBox/Main/src-server/xpcom/server.cpp +++ b/src/VBox/Main/src-server/xpcom/server.cpp @@ -15,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_VBOXSVC #include <ipcIService.h> #include <ipcCID.h> @@ -27,7 +28,7 @@ #include "server.h" -#include "Logging.h" +#include "LoggingNew.h" #include <VBox/param.h> diff --git a/src/VBox/Main/src-server/xpcom/server_module.cpp b/src/VBox/Main/src-server/xpcom/server_module.cpp index ce7f4cedc67..507074345e0 100644 --- a/src/VBox/Main/src-server/xpcom/server_module.cpp +++ b/src/VBox/Main/src-server/xpcom/server_module.cpp @@ -1,6 +1,5 @@ /* $Id$ */ /** @file - * * XPCOM server process helper module implementation functions */ @@ -16,6 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN_VBOXSVC #ifdef RT_OS_OS2 # include <prproces.h> #endif @@ -45,7 +45,7 @@ #include <VBox/com/VirtualBox.h> #include "server.h" -#include "Logging.h" +#include "LoggingNew.h" #include <iprt/errcore.h> diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp index ed065d02af7..ada1a0b222c 100644 --- a/src/VBox/Main/xml/Settings.cpp +++ b/src/VBox/Main/xml/Settings.cpp @@ -69,6 +69,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_MAIN #include "VBox/com/string.h" #include "VBox/settings.h" #include <iprt/base64.h> @@ -85,8 +86,8 @@ // generated header #include "SchemaDefs.h" -#include "Logging.h" #include "HashedPw.h" +#include "LoggingNew.h" using namespace com; using namespace settings; |