Changeset 80305 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 15, 2019 5:35:00 PM (5 years ago)

Author:

vboxsync

Message:

REM,VMM,tstInt,Devices: Use VMM_COMMON_DEFS when including vm.h so the layout is always right. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (3 diffs)
• VMMR3/CPUMR3CpuId.cpp (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (12 diffs)
• tools/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/VMM/Config.kmk

@@ -29 +29 @@
 ## DEFS variable that is picked up by all three VMM targets (R0, R3, RC).
 # Can be prepended to by setting it in LocalConfig.kmk
-VMM_COMMON_DEFS += VBOX_IN_VMM
 ifdef VBOX_WITH_3RD_IEM_STEP
  VMM_COMMON_DEFS += VBOX_WITH_3RD_IEM_STEP

trunk/src/VBox/VMM/Makefile.kmk

@@ -52 +52 @@
 VBoxVMM_SONAME.linux = VBoxVMM.so
 
-VBoxVMM_DEFS     = IN_VMM_R3 IN_DIS IN_GMM_R3 IN_DBG $(VMM_COMMON_DEFS)
+VBoxVMM_DEFS     = VBOX_IN_VMM IN_VMM_R3 IN_DIS IN_GMM_R3 IN_DBG $(VMM_COMMON_DEFS)
 ## @todo eliminate IN_GMM_R3
 ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
@@ -440 +440 @@
 VMMR0_SYSSUFF   = .r0
 
-VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 \
+VMMR0_DEFS      = VBOX_IN_VMM IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 \
         $(VMM_COMMON_DEFS) RTASSERT_HAVE_SHOULD_PANIC
 ## @todo eliminate IN_GVMM_R0 IN_GMM_R0
@@ -605 +605 @@
 LIBRARIES += SSMStandalone
 SSMStandalone_TEMPLATE = VBOXR3EXE
-SSMStandalone_DEFS     = IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE CPUM_DB_STANDALONE
+SSMStandalone_DEFS     = VBOX_IN_VMM IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE CPUM_DB_STANDALONE $(VMM_COMMON_DEFS)
 SSMStandalone_INCS     = include
 SSMStandalone_SOURCES  = \

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -2022 +2022 @@
  *
  */
-#ifdef VBOX_IN_VMM
+#ifndef IN_VBOX_CPU_REPORT
 
 
@@ -7157 +7157 @@
 }
 
-#endif /* VBOX_IN_VMM */
-
+#endif /* !IN_VBOX_CPU_REPORT */
+

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

@@ -139 +139 @@
 ifdef VBOX_WITH_RAW_MODE
 tstVMStructRC_TEMPLATE  = VBoxRcExe
-tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
+tstVMStructRC_DEFS      = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
  ifdef VBOX_WITH_R0_LOGGING
 tstVMStructRC_DEFS     += VBOX_WITH_R0_LOGGING
@@ -153 +153 @@
 
 tstVMStructSize_TEMPLATE= VBOXR3AUTOTST
-tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
+tstVMStructSize_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
 ifdef VBOX_WITH_RAW_MODE
 tstVMStructSize_DEFS   += VBOX_WITH_RAW_MODE
@@ -173 +173 @@
 
 tstAsmStructs_TEMPLATE  = VBOXR3AUTOTST
-tstAsmStructs_DEFS      = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
+tstAsmStructs_DEFS      = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
 ifdef VBOX_WITH_RAW_MODE
 tstAsmStructs_DEFS     += VBOX_WITH_RAW_MODE
@@ -191 +191 @@
 ifdef VBOX_WITH_RAW_MODE
 tstAsmStructsRC_TEMPLATE= VBoxRcExe
-tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
+tstAsmStructsRC_DEFS    = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
  ifdef VBOX_WITH_R0_LOGGING
 tstAsmStructsRC_DEFS   += VBOX_WITH_R0_LOGGING
@@ -246 +246 @@
 tstMMHyperHeap_TEMPLATE = VBOXR3TSTEXE
 endif
+tstMMHyperHeap_DEFS     = $(VMM_COMMON_DEFS)
 tstMMHyperHeap_SOURCES  = tstMMHyperHeap.cpp
 tstMMHyperHeap_LIBS     = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
@@ -254 +255 @@
 tstSSM_TEMPLATE         = VBOXR3TSTEXE
 tstSSM_INCS             = $(VBOX_PATH_VMM_SRC)/include
+tstSSM_DEFS             = $(VMM_COMMON_DEFS)
 tstSSM_SOURCES          = tstSSM.cpp
 tstSSM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
@@ -269 +271 @@
 tstCFGM_TEMPLATE         = VBOXR3TSTEXE
 endif
+tstCFGM_DEFS             = $(VMM_COMMON_DEFS)
 tstCFGM_SOURCES          = tstCFGM.cpp
 tstCFGM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
@@ -306 +309 @@
 tstVMREQ_TEMPLATE         = VBOXR3EXE
 endif
+tstVMREQ_DEFS             = $(VMM_COMMON_DEFS)
 tstVMREQ_SOURCES          = tstVMREQ.cpp
 tstVMREQ_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
@@ -321 +325 @@
 tstAnimate_TEMPLATE         = VBOXR3EXE
 endif
+tstAnimate_DEFS             = $(VMM_COMMON_DEFS)
 tstAnimate_SOURCES          = tstAnimate.cpp
 tstAnimate_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
@@ -439 +444 @@
 tstPDMAsyncCompletion_TEMPLATE         = VBOXR3EXE
  endif
+tstPDMAsyncCompletion_DEFS             = $(VMM_COMMON_DEFS)
 tstPDMAsyncCompletion_INCS             = $(VBOX_PATH_VMM_SRC)/include
 tstPDMAsyncCompletion_SOURCES          = tstPDMAsyncCompletion.cpp
@@ -455 +461 @@
 tstPDMAsyncCompletionStress_TEMPLATE   = VBOXR3EXE
  endif
+tstPDMAsyncCompletionStress_DEFS       = $(VMM_COMMON_DEFS)
 tstPDMAsyncCompletionStress_INCS       = $(VBOX_PATH_VMM_SRC)/include
 tstPDMAsyncCompletionStress_SOURCES    = tstPDMAsyncCompletionStress.cpp
@@ -476 +483 @@
      || defined(VBOX_WITH_DTRACE_RC))
 tstVMStructDTrace_TEMPLATE = VBOXR3AUTOTST
-tstVMStructDTrace_DEFS     = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
+tstVMStructDTrace_DEFS     = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
  ifdef VBOX_WITH_RAW_MODE
 tstVMStructDTrace_DEFS    += VBOX_WITH_RAW_MODE

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

@@ -55 +55 @@
 PROGRAMS += VBoxCpuReport
 VBoxCpuReport_TEMPLATE := VBoxR3Static
-VBoxCpuReport_DEFS      = IN_VMM_R3 IN_VBOX_CPU_REPORT
+VBoxCpuReport_DEFS      = VBOX_IN_VMM IN_VMM_R3 IN_VBOX_CPU_REPORT $(VMM_COMMON_DEFS)
 VBoxCpuReport_INCS      = ../include
 VBoxCpuReport_SOURCES   = \