Changeset 80641 in vbox for trunk/include/VBox/vmm/vm.h

Timestamp:

Sep 6, 2019 8:09:16 PM (5 years ago)

Author:

vboxsync

Message:

IOM: New I/O port registration code. bugref:9218

File:

• trunk/include/VBox/vmm/vm.h (modified) (3 diffs)

trunk/include/VBox/vmm/vm.h

@@ -1007 +1007 @@
  * it isn't.
  */
-#define VM_ASSERT_EMT0_RETURN(pVM, rc)      VMCPU_ASSERT_EMT_RETURN(&(pVM)->aCpus[0], (rc))
+#ifdef IN_RING3
+# define VM_ASSERT_EMT0_RETURN(pVM, rc)     VMCPU_ASSERT_EMT_RETURN((pVM)->apCpusR3[0], (rc))
+#else
+# define VM_ASSERT_EMT0_RETURN(pVM, rc)     VMCPU_ASSERT_EMT_RETURN(&(pVM)->aCpus[0], (rc))
+#endif
 
 
@@ -1323 +1327 @@
         struct IOM s;
 #endif
-        uint8_t     padding[896];       /* multiple of 64 */
+        uint8_t     padding[960];       /* multiple of 64 */
     } iom;
 
@@ -1447 +1451 @@
     /** Padding for aligning the structure size on a page boundrary. */
 #ifdef VBOX_WITH_REM
-    uint8_t         abAlignment2[3032       - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
-#else
-    uint8_t         abAlignment2[3032 + 256 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
+    uint8_t         abAlignment2[2968       - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
+#else
+    uint8_t         abAlignment2[2968 + 256 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
 #endif