VirtualBox

Changeset 20922 in vbox for trunk


Ignore:
Timestamp:
Jun 25, 2009 11:17:45 AM (16 years ago)
Author:
vboxsync
Message:

Config.kmk,VMM/Makefile.kmk: Retired VBOX_WITH_SMP_GUESTS (unused), moved VBOX_WITH_MULTI_CORE from global DEFS to individual ones. Some makefile cleanup.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r20917 r20922  
    157157
    158158ifeq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
    159 # for 3.0.0 Alpha/Beta 
     159# for 3.0.0 Alpha/Beta
    160160# export VBOX_ADDITIONS_SH_MODE = release
    161161# export VBOX_DOCUMENTATION_SH_MODE = release
    … …  
    394394# Enable multi-core VCPUs.
    395395VBOX_WITH_MULTI_CORE = 1
    396 # Enable SMP support in guests
    397 ##VBOX_WITH_SMP_GUESTS = 1
    398396# Enable the host/guest information service (aka guest properties).
    399397VBOX_WITH_GUEST_PROPS = 1
    … …  
    10881086ifdef VBOX_WITH_64_BITS_GUESTS
    10891087 DEFS += VBOX_WITH_64_BITS_GUESTS
    1090 endif
    1091 ifdef VBOX_WITH_SMP_GUESTS
    1092  DEFS += VBOX_WITH_SMP_GUESTS
    1093 endif
    1094 ifdef VBOX_WITH_MULTI_CORE
    1095  DEFS += VBOX_WITH_MULTI_CORE
    10961088endif
    10971089ifdef VBOX_WITH_HARDENING

  • trunk/src/VBox/VMM/Makefile.kmk

    r20871 r20922  
    3333
    3434VMMR3_TEMPLATE  = VBOXR3
     35
    3536VMMR3_DEFS      = IN_VMM_R3 IN_DIS IN_GMM_R3 IN_DBG
    3637## @todo eliminate IN_GMM_R3
    3738ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    38 VMMR3_DEFS     += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
     39 VMMR3_DEFS    += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    3940endif
    4041ifdef VBOX_WITH_R0_LOGGING
    41 VMMR3_DEFS     += VBOX_WITH_R0_LOGGING
     42 VMMR3_DEFS    += VBOX_WITH_R0_LOGGING
     43endif
     44ifdef VBOX_WITH_MULTI_CORE
     45 VMMR3_DEFS    += VBOX_WITH_MULTI_CORE
     46endif
     47ifdef VBOX_WITH_USB
     48 VMMR3_DEFS    += VBOX_WITH_USB
     49endif
     50ifdef VBOX_WITH_VMI
     51 VMMR3_DEFS    += \
     52        VBOX_WITH_VMI
     53endif
     54ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
     55 VMMR3_DEFS    += VBOX_WITH_PDM_ASYNC_COMPLETION
    4256endif
    4357VMMR3_DEFS.darwin.x86 = \
    4458        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 \
    4559        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R3
    46 VMMR3_INCS     := \
    47         $(PATH_SUB_CURRENT) \
     60
     61VMMR3_INCS     = \
     62        . \
    4863        PATM
     64ifdef VBOX_WITH_VMI
     65 VMMR3_INCS   += \
     66        PARAV
     67endif
    4968
    5069VMMR3_SOURCES   = \
    … …  
    134153        PATM/PATMSSM.cpp \
    135154        PATM/VMMAll/PATMAll.cpp
     155ifdef VBOX_WITH_VMI
     156 VMMR3_SOURCES += \
     157        PARAV/PARAV.cpp \
     158        PARAV/PARAVAll.cpp
     159endif
     160ifdef VBOX_WITH_USB
     161 VMMR3_SOURCES += PDMUsb.cpp
     162endif
     163ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
     164 VMMR3_SOURCES += \
     165        PDMAsyncCompletion.cpp \
     166        PDMAsyncCompletionFile.cpp
     167endif
     168
    136169VMMR3_SOURCES.x86 += \
    137170        VMMSwitcher/32BitTo32Bit.asm \
    … …  
    147180        VMMSwitcher/AMD64ToPAE.asm
    148181
    149 ifdef VBOX_WITH_VMI
    150 VMMR3_DEFS += \
    151         VBOX_WITH_VMI
    152 VMMR3_INCS += \
    153         PARAV
    154 VMMR3_SOURCES += \
    155         PARAV/PARAV.cpp \
    156         PARAV/PARAVAll.cpp
    157 endif
    158 
    159 ifdef VBOX_WITH_USB
    160 VMMR3_DEFS += VBOX_WITH_USB
    161 VMMR3_SOURCES += PDMUsb.cpp
    162 endif
    163 
    164 ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    165 VMMR3_DEFS += VBOX_WITH_PDM_ASYNC_COMPLETION
    166 VMMR3_SOURCES += \
    167         PDMAsyncCompletion.cpp \
    168         PDMAsyncCompletionFile.cpp
    169 endif
    170182
    171183#
    … …  
    173185#
    174186DLLS += VBoxVMM
    175 
    176187VBoxVMM_TEMPLATE = VBOXR3
    177188VBoxVMM_DEFS = $(VMMR3_DEFS)
    … …  
    184195        $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    185196ifdef VBOX_WITH_DEBUGGER
    186 VBoxVMM_LIBS += \
    187         $(PATH_LIB)/Debugger$(VBOX_SUFF_LIB)
     197 VBoxVMM_LIBS += \
     198        $(PATH_LIB)/Debugger$(VBOX_SUFF_LIB)
    188199endif
    189200VBoxVMM_LIBS += \
    … …  
    279290SYSMODS += VMMGC
    280291VMMGC_TEMPLATE  = VBOXGC
     292VMMGC_SYSSUFF   = .gc
     293
     294VMMGC_DEFS      = IN_VMM_RC IN_RT_GC IN_RT_RC IN_DIS DIS_CORE_ONLY
     295ifdef VBOX_WITH_R0_LOGGING
     296 VMMGC_DEFS    += VBOX_WITH_R0_LOGGING
     297endif
     298ifdef VBOX_WITH_MULTI_CORE
     299 VMMGC_DEFS    += VBOX_WITH_MULTI_CORE
     300endif
     301ifdef VBOX_WITH_VMI
     302 VMMGC_DEFS    += VBOX_WITH_VMI
     303endif
     304ifeq ($(KBUILD_TARGET_ARCH),x86)
     305 VMMGC_DEFS.darwin = \
     306        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
     307        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
     308endif
     309
    281310VMMGC_INCS     := \
    282         $(PATH_SUB_CURRENT) \
     311        . \
    283312        VMMGC \
    284313        PATM
    285 VMMGC_DEFS      = IN_VMM_RC IN_RT_GC IN_RT_RC IN_DIS DIS_CORE_ONLY
    286 ifdef VBOX_WITH_R0_LOGGING
    287 VMMGC_DEFS     += VBOX_WITH_R0_LOGGING
    288 endif
    289 ifeq ($(KBUILD_TARGET_ARCH),x86)
    290 VMMGC_DEFS.darwin = \
    291         VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
    292         VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
    293 endif
    294 VMMGC_SYSSUFF   = .gc
     314
    295315VMMGC_LIBS      = \
    296316        $(PATH_LIB)/DisasmGC$(VBOX_SUFF_LIB) \
    297317        $(PATH_LIB)/RuntimeGC$(VBOX_SUFF_LIB)
    298318ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
    299 VMMGC_LIBS     += \
     319 VMMGC_LIBS    += \
    300320        $(PATH_LIB)/VMMGCBuiltin$(VBOX_SUFF_LIB)
    301321endif
     322
    302323ifeq ($(VBOX_LDR_FMT32),pe)
    303 VMMGC_LDFLAGS   = -Entry:VMMGCEntry
    304 endif
     324 VMMGC_LDFLAGS  = -Entry:VMMGCEntry
     325endif
     326
    305327VMMGC_SOURCES   = \
    306328        VMMGC/VMMGC0.asm \
    … …  
    353375        PATM/VMMGC/PATMGC.cpp \
    354376        PATM/VMMAll/PATMAll.cpp
    355 
     377ifdef VBOX_WITH_VMI
     378 VMMGC_SOURCES += \
     379        PARAV/PARAV.cpp \
     380        PARAV/PARAVAll.cpp
     381endif
    356382ifeq ($(VBOX_LDR_FMT32),pe)
    357 VMMGC_SOURCES += VMMGC/VMMGC.def
     383 VMMGC_SOURCES += VMMGC/VMMGC.def
    358384endif
    359385ifeq ($(VBOX_LDR_FMT32),lx)
    360 VMMGC_SOURCES += $(PATH_VMMGCImp)/VMMGC.def
    361 endif
    362 
    363 ifdef VBOX_WITH_VMI
    364 VMMGC_DEFS += \
    365         VBOX_WITH_VMI
    366 VMMGC_SOURCES += \
    367         PARAV/PARAV.cpp \
    368         PARAV/PARAVAll.cpp
    369 endif
     386 VMMGC_SOURCES += $(PATH_VMMGCImp)/VMMGC.def
     387endif
     388
    370389
    371390# the very last one.
    … …  
    380399SYSMODS += VMMR0
    381400VMMR0_TEMPLATE  = VBOXR0
    382 VMMR0_INCS     := \
    383         $(PATH_SUB_CURRENT) \
    384         PATM
     401VMMR0_SYSSUFF   = .r0
     402
    385403VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 RTASSERT_HAVE_SHOULD_PANIC
    386404## @todo eliminate IN_GVMM_R0 IN_GMM_R0
    387405ifdef VBOX_WITH_R0_LOGGING
    388 VMMR0_DEFS     += VBOX_WITH_R0_LOGGING
     406 VMMR0_DEFS    += VBOX_WITH_R0_LOGGING
    389407endif
    390408ifdef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
    391 VMMR0_DEFS     += VBOX_WITH_VMMR0_DISABLE_PREEMPTION
     409 VMMR0_DEFS    += VBOX_WITH_VMMR0_DISABLE_PREEMPTION
     410endif
     411ifdef VBOX_WITH_MULTI_CORE
     412 VMMR0_DEFS    += VBOX_WITH_MULTI_CORE
    392413endif
    393414VMMR0_DEFS.darwin.x86 = \
    394415        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 \
    395416        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R0
     417
    396418ifeq ($(VBOX_LDR_FMT),pe)
    397 VMMR0_LDFLAGS   = -Entry:VMMR0EntryEx
     419 VMMR0_LDFLAGS  = -Entry:VMMR0EntryEx
    398420endif
    399421ifeq ($(VBOX_LDR_FMT),elf)
    400  VMMR0_LDFLAGS   = -e VMMR0EntryEx
    401 endif
    402 VMMR0_SYSSUFF   = .r0
     422 VMMR0_LDFLAGS  = -e VMMR0EntryEx
     423endif
     424VMMR0_INCS      = \
     425        . \
     426        PATM
     427
    403428VMMR0_SOURCES   = \
    404429        VMMR0/CPUMR0.cpp \
    … …  
    446471        VMMAll/VMAll.cpp \
    447472        VMMAll/VMMAll.cpp
     473ifeq ($(VBOX_LDR_FMT),pe)
     474 VMMR0_SOURCES += VMMR0/VMMR0.def
     475endif
     476ifeq ($(VBOX_LDR_FMT),lx)
     477 VMMR0_SOURCES += $(PATH_VMMR0Imp)/VMMR0.def
     478endif
    448479VMMR0_SOURCES.amd64 = \
    449480        VMMR0/VMMR0JmpA-amd64.asm
    … …  
    456487VMMAll/PGMAllPool.cpp_CXXFLAGS = $(if-expr $(KBUILD_TARGET) == "win",,$(VBOX_GCC_Wno-array_bounds))
    457488
    458 ifeq ($(VBOX_LDR_FMT),pe)
    459 VMMR0_SOURCES += VMMR0/VMMR0.def
    460 endif
    461 ifeq ($(VBOX_LDR_FMT),lx)
    462 VMMR0_SOURCES += $(PATH_VMMR0Imp)/VMMR0.def
    463 endif
    464489
    465490VMMR0_LIBS = \
    … …  
    468493        $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB)
    469494ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
    470 VMMR0_LIBS += \
    471         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     495 VMMR0_LIBS += \
     496        $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
    472497endif
    473498
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