← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/VBox/log-vbox.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/VBox/log-vbox.cpp
293
293
     * Create the default logging instance.
294
294
     */
295
295
#ifdef IN_RING3
296
 
# ifndef IN_GUEST_R3
 
296
# ifndef IN_GUEST
297
297
    char szExecName[RTPATH_MAX];
298
298
    if (!RTProcGetExecutableName(szExecName, sizeof(szExecName)))
299
299
        strcpy(szExecName, "VBox");
378
378
#  endif
379
379
    }
380
380
 
381
 
# else  /* IN_GUEST_R3  */
 
381
# else  /* IN_GUEST */
382
382
    /* The user destination is backdoor logging. */
383
383
    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG",
384
384
                     RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
385
385
                     RTLOGDEST_USER, "VBox.log");
386
 
# endif /* IN_GUEST_R3 */
 
386
# endif /* IN_GUEST */
387
387
 
388
388
#else /* IN_RING0 */
389
 
    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
390
 
# ifdef LOG_TO_BACKDOOR  /** @todo look at guest ring 0 logging */
391
 
                         RTLOGDEST_USER,
392
 
# else
393
 
                         RTLOGDEST_FILE,
394
 
# endif
395
 
                         "VBox-ring0.log");
 
389
# ifndef IN_GUEST
 
390
    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_FILE, "VBox-ring0.log");
 
391
# else  /* IN_GUEST */
 
392
    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_USER, "VBox-ring0.log");
 
393
# endif /* IN_GUEST */
396
394
    if (RT_SUCCESS(rc))
397
395
    {
398
396
        /*
403
401
         * destination is the one doing all the work. On platforms
404
402
         * that do differ (like Darwin), STDOUT is the kernel log.
405
403
         */
406
 
# if 0 /*defined(DEBUG_bird) && !defined(IN_GUEST)*/
407
 
        //RTLogGroupSettings(pLogger, "all=~0 -default.l6.l5.l4.l3");
408
 
        RTLogGroupSettings(pLogger, "all=0 pgm*=~0 gmm=~0");
 
404
# if defined(DEBUG_bird)
 
405
        /*RTLogGroupSettings(pLogger, "all=~0 -default.l6.l5.l4.l3");*/
409
406
        RTLogFlags(pLogger, "enabled unbuffered pid tid");
 
407
#  ifndef IN_GUEST
410
408
        pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT;
 
409
#  endif
411
410
# endif
412
411
# if defined(DEBUG_sandervl) && !defined(IN_GUEST)
413
412
        RTLogGroupSettings(pLogger, "+all");