Changeset 82031 in vbox for trunk/include/VBox/vmm

Timestamp:

Nov 20, 2019 4:11:16 PM (5 years ago)

Author:

vboxsync

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

134835

Message:

APIC: Converted the timer pointers to timer handles. This requires PPDMDEVINS to be accessible when called directly from the VMM, so adding pointers to the APIC specific GVM and VM structures. bugref:9218

File:

• trunk/include/VBox/vmm/gvm.h (modified) (1 diff)

trunk/include/VBox/vmm/gvm.h

@@ -213 +213 @@
     } iomr0;
 
+    union
+    {
+#if defined(VMM_INCLUDED_SRC_include_APICInternal_h) && defined(IN_RING0)
+        struct APICR0PERVM  s;
+#endif
+        uint8_t             padding[64];
+    } apicr0;
+
     /** Padding so aCpus starts on a page boundrary.  */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t         abPadding2[4096 - 64 - 256 - 512 - 256 - 64 - 1792 - 512 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
-#else
-    uint8_t         abPadding2[4096 - 64 - 256 - 512       - 64 - 1792 - 512 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[4096 - 64 - 256 - 512 - 256 - 64 - 1792 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+#else
+    uint8_t         abPadding2[4096 - 64 - 256 - 512       - 64 - 1792 - 512 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #endif