VirtualBox

Changeset 38736 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Sep 13, 2011 1:58:47 PM (13 years ago)
Author:
vboxsync
Message:

*: Please don NOT redefine logger macros.

Location:
trunk/src/VBox
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h

    r28800 r38736  
    2828
    2929#ifndef RT_OS_WINDOWS
    30 
    31 /* Since I don't know the background for the stuff below, I prefer not to
    32    change it.  I don't need it or want it for backdoor logging inside the
    33    Linux Guest Additions kernel modules though. */
    34 /* Update: bird made this the stance on all non-windows platforms. */
    35 # include <VBox/log.h>
    36 
    37 #else  /* RT_OS_LINUX not defined */
     30# error "Don't include this file."
     31#else  /* RT_OS_WINDOWS */
    3832/* Save LOG_ENABLED state, because "VBox/rt/log.h"
    3933 * may undefine it for IN_RING0 code.
    … …  
    6054# endif
    6155
    62 #endif  /* RT_OS_LINUX not defined */
     56#endif  /* RT_OS_WINDOWS */
    6357
    64 #endif /* __VBOXGUESTLOG__H */
     58#endif /* !__VBOXGUESTLOG__H */

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h

    r33994 r38736  
    5353#endif
    5454
    55 #if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     55#if defined(RT_OS_WINDOWS)
    5656/** @todo remove this legacy and use VBox/log.h and/or iprt/log.h. */
    5757# ifdef DEBUG

  • trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h

    r33994 r38736  
    11/** @file
    2  *
    3  * vboxsf -- VirtualBox Guest Additions for Linux
     2 * vboxsf - VirtualBox Guest Additions for Linux.
    43 */
    54
    65/*
    7  * Copyright (C) 2006-2010 Oracle Corporation
     6 * Copyright (C) 2006-2011 Oracle Corporation
    87 *
    98 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1918#define VFSMOD_H
    2019
     20#define LOG_GROUP LOG_GROUP_SHARED_FOLDERS
    2121#include "the-linux-kernel.h"
    2222#include "version-generated.h"
    2323#include "product-generated.h"
     24#include <VBox/log.h>
    2425
    2526#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
    … …  
    155156#endif
    156157
    157 #endif /* vfsmod.h */
     158#endif
     159

  • trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c

    r33656 r38736  
    2929*   Header Files                                                               *
    3030*******************************************************************************/
     31#ifdef DEBUG_ramshankar
     32# define LOG_INSTANCE       RTLogRelDefaultInstance()
     33#endif
    3134#undef offsetof     /* This gets redefined in drmP.h */
    3235#include "include/drmP.h"
    … …  
    3841#include <VBox/version.h>
    3942
    40 #ifdef DEBUG_ramshankar
    41 # undef LogFlow
    42 # undef Log
    43 # define LogFlow LogRel
    44 # define Log     LogRel
    45 #endif
    4643
    4744/*******************************************************************************

  • trunk/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c

    r34233 r38736  
    11/* $Id$ */
    22/** @file
    3  * VirtualBox Guest Additions: Virtio Driver for Solaris.
     3 * VirtualBox Guest Additions - Virtio Driver for Solaris.
    44 */
    55
    … …  
    2828*   Header Files                                                               *
    2929*******************************************************************************/
     30#ifdef DEBUG_ramshankar
     31# define LOG_INSTANCE       RTLogRelDefaultInstance()
     32#endif
    3033#include "Virtio-solaris.h"
    3134
    … …  
    3437#include <VBox/log.h>
    3538
    36 #if defined(DEBUG_ramshankar)
    37 # undef LogFlowFunc
    38 # define LogFlowFunc        LogRel
    39 # undef Log
    40 # define Log                LogRel
    41 # undef LogFlow
    42 # define LogFlow            LogRel
    43 #endif
    4439
    4540/**

  • trunk/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c

    r34143 r38736  
    11/* $Id$ */
    22/** @file
    3  * VirtualBox Guest Additions: Virtio Network Driver for Solaris.
     3 * VirtualBox Guest Additions - Virtio Network Driver for Solaris.
    44 */
    55
    … …  
    2828*   Header Files                                                               *
    2929*******************************************************************************/
     30#ifdef DEBUG_ramshankar
     31# define LOG_INSTANCE       RTLogRelDefaultInstance()
     32#endif
    3033#include "Virtio-solaris.h"
    3134#include "VirtioPci-solaris.h"
    … …  
    7578#define VIRTIO_NET_CTRL_VLAN      0x00080000      /* Control channel VLAN filtering */
    7679
    77 #if defined(DEBUG_ramshankar)
    78 # undef LogFlowFunc
    79 # define LogFlowFunc        LogRel
    80 # undef Log
    81 # define Log                LogRel
    82 # undef LogFlow
    83 # define LogFlow            LogRel
    84 #endif
    8580
    8681/*******************************************************************************

  • trunk/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c

    r34233 r38736  
    11/* $Id$ */
    22/** @file
    3  * VirtualBox Guest Additions: Virtio Driver for Solaris, PCI Hypervisor Interface.
     3 * VirtualBox Guest Additions - Virtio Driver for Solaris, PCI Hypervisor Interface.
    44 */
    55
    … …  
    2828*   Header Files                                                               *
    2929*******************************************************************************/
     30#ifdef DEBUG_ramshankar
     31# define LOG_INSTANCE       RTLogRelDefaultInstance()
     32#endif
    3033#include "VirtioPci-solaris.h"
    3134
    … …  
    5760#define VIRTIO_PCI_RING_ALIGN               PAGE_SIZE
    5861#define VIRTIO_PCI_QUEUE_ADDR_SHIFT         PAGE_SHIFT
    59 
    60 #if defined(DEBUG_ramshankar)
    61 # undef LogFlowFunc
    62 # define LogFlowFunc        LogRel
    63 # undef Log
    64 # define Log                LogRel
    65 # undef LogFlow
    66 # define LogFlow            LogRel
    67 #endif
    6862
    6963/**

  • trunk/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c

    r34233 r38736  
    2828*   Header Files                                                               *
    2929*******************************************************************************/
     30#ifdef DEBUG_ramshankar
     31# define LOG_INSTANCE       RTLogRelDefaultInstance()
     32#endif
    3033#include "Virtio-solaris.h"
    3134
    … …  
    3740
    3841#include <sys/cmn_err.h>
    39 
    40 #if defined(DEBUG_ramshankar)
    41 # undef LogFlowFunc
    42 # define LogFlowFunc        LogRel
    43 # undef Log
    44 # define Log                LogRel
    45 # undef LogFlow
    46 # define LogFlow            LogRel
    47 #endif
    4842
    4943/**

  • trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp

    r37811 r38736  
    2121*******************************************************************************/
    2222#define LOG_GROUP LOG_GROUP_DRV_USBPROXY
     23#ifdef DEBUG_ramshankar
     24# define LOG_INSTANCE       RTLogRelDefaultInstance()
     25#endif
    2326#include <sys/poll.h>
    2427#include <errno.h>
    … …  
    4447#define USBPROXY              "USBProxy"
    4548
    46 #if defined(DEBUG_ramshankar)
    47 #undef Log
    48 #define Log             LogRel
    49 #undef LogFlow
    50 #define LogFlow         LogRel
    51 #undef LogFlowFunc
    52 #define LogFlowFunc     LogRel
    53 #endif
    5449
    5550/*******************************************************************************

  • trunk/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp

    r29798 r38736  
     1/* $Id$ */
    12/** @file
    2  *
    3  * VBox Host Guest Shared Memory Interface (HGSMI).
    4  * HGSMI functions common for both host and guest.
     3 * VBox Host Guest Shared Memory Interface (HGSMI) - Functions common to both host and guest.
    54 */
    65
    76/*
    8  * Copyright (C) 2006-2009 Oracle Corporation
     7 * Copyright (C) 2006-2011 Oracle Corporation
    98 *
    109 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1716 */
    1817
     18#define LOG_DISABLED /* Maybe we can enabled it all the time now? */
     19#define LOG_GROUP LOG_GROUP_HGSMI
    1920#include <iprt/heap.h>
    2021#include <iprt/string.h>
    2122
    2223#include <VBox/HGSMI/HGSMI.h>
    23 
    24 //#define LOG_GROUP LOG_GROUP_HGSMI
    25 //#include <VBox/log.h>
    26 #define Log(f) do{}while(0)
    27 #define LogFlowFunc(f) do{}while(0)
    28 #define LogFunc(f) do{}while(0)
     24#include <VBox/log.h>
    2925
    3026

  • trunk/src/VBox/HostDrivers/VBoxNetAdp/solaris/VBoxNetAdp-solaris.c

    r37786 r38736  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_NET_ADP_DRV
     22#ifdef DEBUG_ramshankar
     23# define LOG_INSTANCE       RTLogRelDefaultInstance()
     24#endif
    2225#include <VBox/log.h>
    2326#include <VBox/err.h>
    … …  
    5457#define VBOXNETADP_MTU           1500
    5558
    56 #if defined(DEBUG_ramshankar)
    57 # undef LogFlowFunc
    58 # define LogFlowFunc        LogRel
    59 # undef Log
    60 # define Log                LogRel
    61 # undef LogFlow
    62 # define LogFlow            LogRel
    63 #endif
    64 
     59
     60/*******************************************************************************
     61*   Internal Functions                                                         *
     62*******************************************************************************/
    6563static int VBoxNetAdpSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd);
    6664static int VBoxNetAdpSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd);

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

    r37983 r38736  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_NET_FLT_DRV
     22#ifdef DEBUG_ramshankar
     23# define LOG_INSTANCE       RTLogRelDefaultInstance()
     24#endif
    2225#include <VBox/log.h>
    2326#include <VBox/err.h>
    … …  
    8487#define DEVICE_DESC_DRV                 "VirtualBox NetDrv"
    8588#define DEVICE_DESC_MOD                 "VirtualBox NetMod"
    86 
    87 #if defined(DEBUG_ramshankar)
    88 # undef LogFlowFunc
    89 # define LogFlowFunc            LogRel
    90 # undef Log
    91 # define Log                    LogRel
    92 # undef LogFlow
    93 # define LogFlow                LogRel
    94 #endif
    9589
    9690#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFltBow-solaris.c

    r38640 r38736  
    2020*******************************************************************************/
    2121#define LOG_GROUP LOG_GROUP_NET_FLT_DRV
     22#ifdef DEBUG_ramshankar
     23# define LOG_INSTANCE       RTLogRelDefaultInstance()
     24#endif
    2225#include <VBox/log.h>
    2326#include <VBox/err.h>
    … …  
    7578/** VBOXNETFLTVNIC::u32Magic */
    7679# define VBOXNETFLTVNIC_MAGIC           0x0ddfaced
    77 
    78 #if defined(DEBUG_ramshankar)
    79 # undef Log
    80 # define Log        LogRel
    81 # undef LogFlow
    82 # define LogFlow    LogRel
    83 # undef LOCAL
    84 # define LOCAL
    85 #endif
    8680
    8781/** VLAN tag masking, should probably be in IPRT? */

  • trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp

    r37151 r38736  
    55
    66/*
    7  * Copyright (C) 2008 Oracle Corporation
     7 * Copyright (C) 2008-2011 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2020*   Header Files                                                               *
    2121*******************************************************************************/
     22#ifdef DEBUG_ramshankar
     23# define LOG_INSTANCE       RTLogRelDefaultInstance()
     24#endif
    2225#include <VBox/usblib.h>
    2326#include <VBox/err.h>
    … …  
    4043# include <strings.h>
    4144
    42 /** -XXX- Remove this hackery eventually */
    43 #ifdef DEBUG_ramshankar
    44 # undef Log
    45 # undef LogFlow
    46 # define Log        LogRel
    47 # define LogFlow    LogRel
    48 #endif
    4945
    5046/*******************************************************************************

  • trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c

    r38379 r38736  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
     21#define LOG_GROUP LOG_GROUP_USB_DRV
     22#ifdef DEBUG_ramshankar
     23# define LOG_INSTANCE       RTLogRelDefaultInstance()
     24#endif
    2125#include <VBox/version.h>
    2226#include <VBox/log.h>
    … …  
    9195/** Maximum asynchronous requests per pipe */
    9296#define VBOXUSB_MAX_PIPE_ASYNC_REQS                     2
    93 
    94 #if defined(DEBUG_ramshankar)
    95 # undef Log
    96 # define Log            LogRel
    97 # undef LogFlow
    98 # define LogFlow        LogRel
    99 # undef LogFlowFunc
    100 # define LogFlowFunc    LogRel
    101 #endif
    10297
    10398/** For enabling global symbols while debugging  **/

  • trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c

    r38016 r38736  
    2020*******************************************************************************/
    2121#define LOG_GROUP  LOG_GROUP_USB_DRV
     22#ifdef DEBUG_ramshankar
     23# define LOG_INSTANCE       RTLogRelDefaultInstance()
     24#endif
    2225#include "VBoxUSBFilterMgr.h"
    2326#include <VBox/usblib-solaris.h>
    … …  
    5659/** The module description as seen in 'modinfo'. */
    5760#define DEVICE_DESC_DRV          "VirtualBox USBMon"
    58 
    59 #if defined(DEBUG_ramshankar)
    60 # undef LogFlowFunc
    61 # define LogFlowFunc    LogRel
    62 # undef Log
    63 # define Log            LogRel
    64 # undef LogFlow
    65 # define LogFlow        LogRel
    66 #endif
    6761
    6862/*******************************************************************************

  • trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

    r35482 r38736  
     1/* $Id$ */
    12/** @file
    2  *
    3  * Shared Folders:
    4  * VBox Shared Folders.
     3 * Shared Folders - VBox Shared Folders.
    54 */
    65
    … …  
    3231#include <iprt/stream.h>
    3332#ifdef RT_OS_DARWIN
    34 #include <Carbon/Carbon.h>
     33# include <Carbon/Carbon.h>
    3534#endif
    36 
    37 #undef LogFlow
    38 #define LogFlow Log
    3935
    4036#define SHFL_RT_LINK(pClient) ((pClient)->fu32Flags & SHFL_CF_SYMLINKS ? RTPATH_F_ON_LINK : RTPATH_F_FOLLOW_LINK)

  • trunk/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp

    r35346 r38736  
    7171*   Defined Constants And Macros                                               *
    7272*******************************************************************************/
    73 #ifdef DEBUG_ramshankar
    74 # undef Log
    75 # define Log LogRel
    76 #endif
    7773#define DBGFLOG_NAME           "DBGFCoreWrite"
    7874
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette