Changeset 80309 in vbox

Timestamp:

Aug 15, 2019 7:53:56 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132767

Message:

vm.h,gvm.h: Only allow including these when VMM_COMMON_DEFS is in use. VBOX_BUGREF_9217 must be set globally since it influences VBox/types.h. Oh well, it just temporary. bugref:9217

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• include/VBox/vmm/gvm.h (modified) (1 diff)
• include/VBox/vmm/vm.h (modified) (1 diff)
• src/VBox/VMM/Config.kmk (modified) (2 diffs)

trunk/Config.kmk ¶

@@ -430 +430 @@
 if1of ($(KBUILD_TARGET), win)
  VBOX_WITH_NATIVE_NEM = 1
+endif
+# Enables new VM/GVM allocation style (see VBox/types.h too).
+if1of ($(KBUILD_TARGET), win)
+# VBOX_BUGREF_9217 := 1
 endif
 ## @}
@@ -1682 +1686 @@
 ifdef VBOX_WITH_RAW_MODE
  DEFS += VBOX_WITH_RAW_MODE
+endif
+ifdef VBOX_BUGREF_9217 ## @todo remove later.
+ DEFS += VBOX_BUGREF_9217
 endif
 

trunk/include/VBox/vmm/gvm.h ¶

@@ -31 +31 @@
 #endif
 
+#ifndef USING_VMM_COMMON_DEFS
+# error "Compile job does not include VMM_COMMON_DEFS from src/VBox/Config.kmk - make sure you really need to include this file!"
+#endif
 #include <VBox/types.h>
 #ifdef VBOX_BUGREF_9217

trunk/include/VBox/vmm/vm.h ¶

@@ -31 +31 @@
 
 #ifndef VBOX_FOR_DTRACE_LIB
+# ifndef USING_VMM_COMMON_DEFS
+#  error "Compile job does not include VMM_COMMON_DEFS from src/VBox/Config.kmk - make sure you really need to include this file!"
+# endif
 # include <iprt/param.h>
 # include <VBox/param.h>

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 := USING_VMM_COMMON_DEFS
 ifdef VBOX_WITH_3RD_IEM_STEP
  VMM_COMMON_DEFS += VBOX_WITH_3RD_IEM_STEP
@@ -83 +84 @@
  endif
 endif
-ifdef VBOX_BUGREF_9217
- VMM_COMMON_DEFS += VBOX_BUGREF_9217
-endif
 
 # VMM_COMMON_DEFS += VBOX_WITH_NS_ACCOUNTING_STATS