Changeset 78438 in vbox for trunk/include/VBox

Timestamp:

May 7, 2019 3:57:37 PM (6 years ago)

Author:

vboxsync

Message:

VMM: More refactoring of GVM & VM structures for bugref:9217

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (3 diffs)
• vm.h (modified) (2 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -67 +67 @@
 
     /** Pointer to the global (ring-0) VM structure this CPU belongs to. */
-    PGVM            pGVM;
+    R0PTRTYPE(PGVM) pGVM;
 #ifndef VBOX_BUGREF_9217
     /** Pointer to the corresponding cross context CPU structure. */
@@ -95 +95 @@
     union
     {
-# ifdef VMM_INCLUDED_SRC_include_NEMInternal_h
+# if defined(VMM_INCLUDED_SRC_include_NEMInternal_h) && defined(IN_RING0)
         struct NEMR0PERVCPU s;
 # endif
@@ -206 +206 @@
     union
     {
-# ifdef VMM_INCLUDED_SRC_include_NEMInternal_h
+# if defined(VMM_INCLUDED_SRC_include_NEMInternal_h) && defined(IN_RING0)
         struct NEMR0PERVM   s;
 # endif

trunk/include/VBox/vmm/vm.h

@@ -315 +315 @@
 
 #ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSizeAlignment(VMCPU, 4096);
 
 /** @name Operations on VMCPU::enmState
@@ -1633 +1634 @@
 extern DECLIMPORT(VM)   g_VM;
 
+/** The VMCPU structure for virtual CPU \#0.
+ * This is imported from the VMMRCBuiltin module, i.e. it's a one of those magic
+ * globals which we should avoid using.
+ */
+extern DECLIMPORT(VMCPU) g_VCpu0;
+
 RT_C_DECLS_END
 #endif