VirtualBox

vbox的更動 60583 路徑 trunk/src/VBox/Additions


忽略:
時間撮記:
2016-4-20 上午08:29:42 (9 年 以前)
作者:
vboxsync
訊息:

Additions/VBoxService: Cleaned up defines for sub services / features, renaming. Now BoxService's built-in features are only controlled via the VBOX_WITH_VBOXSERVICE_ defines, and not via a mix of VBOX_WITH and VBOXSERVICE_ defines.

位置:
trunk/src/VBox/Additions/common/VBoxService
檔案:
修改 4 筆資料

圖例:

未更動
新增
刪除

  • trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

    r56294 r60583  
    55
    66#
    7 # Copyright (C) 2007-2015 Oracle Corporation
     7# Copyright (C) 2007-2016 Oracle Corporation
    88#
    99# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3030PROGRAMS.win.x86 += VBoxServiceNT
    3131
     32# Enable the timesync service within VBoxService.
     33VBOX_WITH_VBOXSERVICE_TIMESYNC      := 1
     34
     35# Busybox-like toolbox, embedded into VBoxService.
     36VBOX_WITH_VBOXSERVICE_TOOLBOX       := 1
     37
     38# VM-management functions, like memory ballooning and statistics.
     39VBOX_WITH_VBOXSERVICE_MANAGEMENT    := 1
     40
     41if1of ($(KBUILD_TARGET), linux)
     42 # CPU hotplugging.
     43 VBOX_WITH_VBOXSERVICE_CPUHOTPLUG   := 1
     44endif
     45
     46if1of ($(KBUILD_TARGET), win)
     47 # Page Sharing (Page Fusion).
     48 VBOX_WITH_VBOXSERVICE_PAGE_SHARING := 1
     49endif
     50
     51ifdef VBOX_WITH_GUEST_PROPS
     52 VBOX_WITH_VBOXSERVICE_VMINFO       := 1
     53endif
     54
     55ifdef VBOX_WITH_GUEST_CONTROL
     56 # Guest Control.
     57 VBOX_WITH_VBOXSERVICE_CONTROL      := 1
     58endif
     59
    3260#
    3361# VBoxService
    3462#
    3563VBoxService_TEMPLATE      = NewVBoxGuestR3Exe
    36 VBoxService_DEFS          = VBOX_WITH_HGCM VBOXSERVICE_TIMESYNC VBOXSERVICE_MANAGEMENT VBOXSERVICE_TOOLBOX
     64
     65# Define features to be activate.
     66VBoxService_DEFS         += \
     67        $(if $(VBOX_WITH_VBOXSERVICE_CONTROL),VBOX_WITH_VBOXSERVICE_CONTROL,)           \
     68        $(if $(VBOX_WITH_VBOXSERVICE_CPUHOTPLUG),VBOX_WITH_VBOXSERVICE_CPUHOTPLUG,)     \
     69        $(if $(VBOX_WITH_VBOXSERVICE_MANAGEMENT),VBOX_WITH_VBOXSERVICE_MANAGEMENT,)     \
     70        $(if $(VBOX_WITH_VBOXSERVICE_PAGE_SHARING),VBOX_WITH_VBOXSERVICE_PAGE_SHARING,) \
     71        $(if $(VBOX_WITH_VBOXSERVICE_TIMESYNC),VBOX_WITH_VBOXSERVICE_TIMESYNC,)         \
     72        $(if $(VBOX_WITH_VBOXSERVICE_TOOLBOX),VBOX_WITH_VBOXSERVICE_TOOLBOX,)           \
     73        $(if $(VBOX_WITH_VBOXSERVICE_VMINFO),VBOX_WITH_VBOXSERVICE_VMINFO,)
     74
     75# Import global defines.
     76VBoxService_DEFS         +=                                       \
     77        $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,)                   \
     78        $(if $(VBOX_WITH_GUEST_CONTROL),VBOX_WITH_GUEST_CONTROL,) \
     79        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)     \
     80        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
     81
    3782VBoxService_DEFS         += \
    3883        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
    3984VBoxService_DEFS.win     += _WIN32_WINNT=0x0501
    40 VBoxService_DEFS.os2      = VBOX_WITH_HGCM VBOXSERVICE_CLIPBOARD
    41 ifdef VBOX_WITH_DBUS
    42  VBoxService_DEFS        += VBOX_WITH_DBUS
    43 endif
    44 ifdef VBOX_WITH_GUEST_PROPS
    45  VBoxService_DEFS        += VBOX_WITH_GUEST_PROPS VBOXSERVICE_VMINFO
    46 endif
    47 ifdef VBOX_WITH_GUEST_CONTROL
    48  VBoxService_DEFS        += VBOX_WITH_GUEST_CONTROL VBOXSERVICE_CONTROL
    49 endif
    50 ifdef VBOX_WITH_MEMBALLOON
    51  VBoxService_DEFS        += VBOX_WITH_MEMBALLOON
    52 endif
    53 if1of ($(KBUILD_TARGET), win)
    54  VBoxService_DEFS        += VBOXSERVICE_PAGE_SHARING
    55 endif
    56 if1of ($(KBUILD_TARGET), linux)
    57  VBoxService_DEFS        += VBOXSERVICE_CPUHOTPLUG
    58 endif
     85VBoxService_DEFS.os2      = VBOX_WITH_HGCM VBOX_WITH_VBOXSERVICE_CLIPBOARD
     86
    5987ifdef VBOX_WITH_SHARED_FOLDERS
    6088 # darwin freebsd
    … …  
    6492endif
    6593
    66 VBoxService_SOURCES       = \
    67         VBoxService.cpp \
    68         VBoxServiceTimeSync.cpp \
     94VBoxService_SOURCES       =  \
     95        VBoxService.cpp      \
    6996        VBoxServiceUtils.cpp \
    70         VBoxServiceStats.cpp \
     97        VBoxServiceStats.cpp
     98
     99ifdef VBOX_WITH_VBOXSERVICE_TIMESYNC
     100 VBoxService_SOURCES     += \
     101        VBoxServiceTimeSync.cpp
     102endif
     103
     104ifdef VBOX_WITH_VBOXSERVICE_TOOLBOX
     105 VBoxService_SOURCES     += \
    71106        VBoxServiceToolBox.cpp
    72 
    73 ifdef VBOX_WITH_GUEST_CONTROL
    74  VBoxService_SOURCES    += \
    75         VBoxServiceControl.cpp \
     107endif
     108
     109ifdef VBOX_WITH_VBOXSERVICE_CONTROL
     110 VBoxService_SOURCES     +=       \
     111        VBoxServiceControl.cpp        \
    76112        VBoxServiceControlProcess.cpp \
    77113        VBoxServiceControlSession.cpp
    78114endif
    79115
    80 ifdef VBOX_WITH_MEMBALLOON
    81  VBoxService_SOURCES    += \
     116ifdef VBOX_WITH_VBOXSERVICE_MANAGEMENT
     117 VBoxService_SOURCES     += \
    82118        VBoxServiceBalloon.cpp
    83 endif
     119 VBoxService_DEFS        += $(if $(VBOX_WITH_MEMBALLOON),VBOX_WITH_MEMBALLOON,)
     120endif
     121
    84122if1of ($(KBUILD_TARGET), win)
    85123 VBoxService_SOURCES    += \
    … …  
    87125endif
    88126
    89 ifdef VBOX_WITH_GUEST_PROPS
    90  VBoxService_SOURCES.win  = \
     127ifdef VBOX_WITH_VBOXSERVICE_VMINFO
     128 VBoxService_SOURCES.win += \
    91129        VBoxServiceVMInfo-win.cpp
    92  VBoxService_SOURCES     += \
    93         VBoxServiceVMInfo.cpp \
     130 VBoxService_SOURCES     +=  \
     131        VBoxServiceVMInfo.cpp    \
    94132        VBoxServicePropCache.cpp
    95133endif
    96134
    97 if1of ($(KBUILD_TARGET), linux)
     135ifdef VBOX_WITH_VBOXSERVICE_CPUHOTPLUG
    98136 VBoxService_SOURCES     += \
    99137        VBoxServiceCpuHotPlug.cpp
    … …  
    149187VBoxServiceNT_TEMPLATE = NewVBoxGuestR3Exe
    150188VBoxServiceNT_EXTENDS  = VBoxService
    151 VBoxServiceNT_DEFS.win = _WIN32_WINNT=0x0400 TARGET_NT4 VBOXSERVICE_MANAGEMENT
     189VBoxServiceNT_DEFS.win = _WIN32_WINNT=0x0400 TARGET_NT4 VBOX_WITH_VBOXSERVICE_MANAGEMENT
    152190
    153191VBoxServiceVMInfo.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)

  • trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

    r58033 r60583  
    55
    66/*
    7  * Copyright (C) 2007-2015 Oracle Corporation
     7 * Copyright (C) 2007-2016 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    8989
    9090#include "VBoxServiceInternal.h"
    91 #ifdef VBOX_WITH_GUEST_CONTROL
     91#ifdef VBOX_WITH_VBOXSERVICE_CONTROL
    9292# include "VBoxServiceControl.h"
    9393#endif
    … …  
    143143} g_aServices[] =
    144144{
    145 #ifdef VBOXSERVICE_CONTROL
     145#ifdef VBOX_WITH_VBOXSERVICE_CONTROL
    146146    { &g_Control,       NIL_RTTHREAD, false, false, false, false, true },
    147147#endif
    148 #ifdef VBOXSERVICE_TIMESYNC
     148#ifdef VBOX_WITH_VBOXSERVICE_TIMESYNC
    149149    { &g_TimeSync,      NIL_RTTHREAD, false, false, false, false, true },
    150150#endif
    151 #ifdef VBOXSERVICE_CLIPBOARD
     151#ifdef VBOX_WITH_VBOXSERVICE_CLIPBOARD
    152152    { &g_Clipboard,     NIL_RTTHREAD, false, false, false, false, true },
    153153#endif
    154 #ifdef VBOXSERVICE_VMINFO
     154#ifdef VBOX_WITH_VBOXSERVICE_VMINFO
    155155    { &g_VMInfo,        NIL_RTTHREAD, false, false, false, false, true },
    156156#endif
    157 #ifdef VBOXSERVICE_CPUHOTPLUG
     157#ifdef VBOX_WITH_VBOXSERVICE_CPUHOTPLUG
    158158    { &g_CpuHotPlug,    NIL_RTTHREAD, false, false, false, false, true },
    159159#endif
    160 #ifdef VBOXSERVICE_MANAGEMENT
     160#ifdef VBOX_WITH_VBOXSERVICE_MANAGEMENT
    161161# ifdef VBOX_WITH_MEMBALLOON
    162162    { &g_MemBalloon,    NIL_RTTHREAD, false, false, false, false, true },
    … …  
    164164    { &g_VMStatistics,  NIL_RTTHREAD, false, false, false, false, true },
    165165#endif
    166 #if defined(VBOXSERVICE_PAGE_SHARING)
     166#if defined(VBOX_WITH_VBOXSERVICE_PAGE_SHARING)
    167167    { &g_PageSharing,   NIL_RTTHREAD, false, false, false, false, true },
    168168#endif
    … …  
    867867#endif
    868868
    869 #ifdef VBOXSERVICE_TOOLBOX
     869#ifdef VBOX_WITH_VBOXSERVICE_TOOLBOX
    870870    /*
    871871     * Run toolbox code before all other stuff since these things are simpler
    … …  
    879879
    880880    bool fUserSession = false;
    881 #ifdef VBOX_WITH_GUEST_CONTROL
     881#ifdef VBOX_WITH_VBOXSERVICE_CONTROL
    882882    /*
    883883     * Check if we're the specially spawned VBoxService.exe process that
    … …  
    917917#endif
    918918
    919 #ifdef VBOX_WITH_GUEST_CONTROL
     919#ifdef VBOX_WITH_VBOXSERVICE_CONTROL
    920920    /*
    921921     * Check if we're the specially spawned VBoxService.exe process that

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

    r59520 r60583  
    55
    66/*
    7  * Copyright (C) 2012-2015 Oracle Corporation
     7 * Copyright (C) 2012-2016 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    13031303#endif /* RT_OS_WINDOWS */
    13041304
    1305 #ifdef VBOXSERVICE_TOOLBOX
     1305#ifdef VBOX_WITH_VBOXSERVICE_TOOLBOX
    13061306    if (RTStrStr(pszExec, "vbox_") == pszExec)
    13071307    {
    … …  
    13171317         */
    13181318        rc = vgsvcGstCtrlProcessResolveExecutable(pszExec, szExecExp, sizeof(szExecExp));
    1319 #ifdef VBOXSERVICE_TOOLBOX
     1319#ifdef VBOX_WITH_VBOXSERVICE_TOOLBOX
    13201320    }
    13211321#endif

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

    r58029 r60583  
    55
    66/*
    7  * Copyright (C) 2007-2015 Oracle Corporation
     7 * Copyright (C) 2007-2016 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    166166extern VBOXSERVICE  g_VMInfo;
    167167extern VBOXSERVICE  g_CpuHotPlug;
    168 #ifdef VBOXSERVICE_MANAGEMENT
     168#ifdef VBOX_WITH_VBOXSERVICE_MANAGEMENT
    169169extern VBOXSERVICE  g_MemBalloon;
    170170extern VBOXSERVICE  g_VMStatistics;
    171171#endif
    172 #ifdef VBOXSERVICE_PAGE_SHARING
     172#ifdef VBOX_WITH_VBOXSERVICE_PAGE_SHARING
    173173extern VBOXSERVICE  g_PageSharing;
    174174#endif
    … …  
    200200#endif
    201201
    202 #ifdef VBOXSERVICE_TOOLBOX
     202#ifdef VBOX_WITH_VBOXSERVICE_TOOLBOX
    203203extern bool                     VGSvcToolboxMain(int argc, char **argv, RTEXITCODE *prcExit);
    204204#endif
    … …  
    211211#endif /* RT_OS_WINDOWS */
    212212
    213 #ifdef VBOXSERVICE_MANAGEMENT
     213#ifdef VBOX_WITH_VBOXSERVICE_MANAGEMENT
    214214extern uint32_t                 VGSvcBalloonQueryPages(uint32_t cbPage);
    215215#endif
    216 #if defined(VBOXSERVICE_PAGE_SHARING)
     216#if defined(VBOX_WITH_VBOXSERVICE_PAGE_SHARING)
    217217extern RTEXITCODE               VGSvcPageSharingWorkerChild(void);
    218218#endif
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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