Changeset 93655 in vbox for trunk/include/VBox

Timestamp:

Feb 8, 2022 1:56:01 PM (3 years ago)

Author:

vboxsync

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

149810

Message:

VMM/TM,VMM/*: Moved RTTIMENANOTSDATAR0 into the ring-0 only part of the VM structure. Added a VMCC_CTX macro for selecting between tm and tmr0 VM components depending on the compilation context. Added a bunch of missing padding checks for GVM. bugref:10094

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (3 diffs)
• vmcc.h (modified) (1 diff)

trunk/include/VBox/vmm/gvm.h

@@ -287 +287 @@
         TMR0PERVM           s;
 #endif
-        uint8_t             padding[128];
+        uint8_t             padding[192];
     } tmr0;
 
@@ -300 +300 @@
     /** Padding so aCpus starts on a page boundrary.  */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t         abPadding2[16384 - 64 - 4352 - 1024 - 256 - 256 - 64 - 3008 - 1920 - 512 - 64 - 1024 - 128 - 704 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[16384 - 64 - 4352 - 1024 - 256 - 256 - 64 - 3008 - 1920 - 512 - 64 - 1024 - 192 - 704 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #else
-    uint8_t         abPadding2[16384 - 64 - 4352 - 1024 - 256 -       64 - 3008 - 1920 - 512 - 64 - 1024 - 128 - 704 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[16384 - 64 - 4352 - 1024 - 256 -       64 - 3008 - 1920 - 512 - 64 - 1024 - 192 - 704 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #endif
 
@@ -340 +340 @@
 #endif /* !VBOX_INCLUDED_vmm_gvm_h */
 
+

trunk/include/VBox/vmm/vmcc.h

@@ -122 +122 @@
 
 
+/**
+ * Used to pick ring-0 or ring-3 VM component data.
+ *
+ * @code{.cpp}
+ *    pVM->VMCC_CTX(pdm).s.pfnWorker
+ * @endcode
+ */
+#ifdef IN_RING0
+# define VMCC_CTX(a_Name)   a_Name ## r0
+#else
+# define VMCC_CTX(a_Name)   a_Name
+#endif
+
 #endif /* !VBOX_INCLUDED_vmm_vmcc_h */