Changeset 107115 in vbox

Timestamp:

Nov 22, 2024 11:09:17 AM (8 weeks ago)

Author:

vboxsync

Message:

VMM: bugref:10759 APIC restructure [build fix for 32-bit host and darwin NEM]

Location:

trunk

Files:

• include/VBox/vmm/pdmapic.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp (modified) (1 diff)
• src/VBox/VMM/include/PDMInternal.h (modified) (3 diffs)

trunk/include/VBox/vmm/pdmapic.h

@@ -355 +355 @@
     DECLR3CALLBACKMEMBER(int, pfnReserved7, (void));
     DECLR3CALLBACKMEMBER(int, pfnReserved8, (void));
+    DECLR3CALLBACKMEMBER(int, pfnReserved9, (void));
     /** @} */
 } PDMAPICBACKENDR3;
@@ -603 +604 @@
     DECLR0CALLBACKMEMBER(int, pfnReserved7, (void));
     DECLR0CALLBACKMEMBER(int, pfnReserved8, (void));
+    DECLR0CALLBACKMEMBER(int, pfnReserved9, (void));
     /** @} */
 } PDMAPICBACKENDR0;
@@ -841 +843 @@
     DECLRGCALLBACKMEMBER(int, pfnReserved8, (void));
     DECLRGCALLBACKMEMBER(int, pfnReserved9, (void));
+    DECLRGCALLBACKMEMBER(int, pfnReserved10, (void));
     /** @} */
 } PDMAPICBACKENDRC;

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp

@@ -3708 +3708 @@
         if (pVmxTransient->u8GuestTpr != (uint8_t)u64Tpr)
         {
-            int rc = APICSetTpr(pVCpu, (uint8_t)u64Tpr);
+            int rc = PDMApicSetTpr(pVCpu, (uint8_t)u64Tpr);
             AssertRC(rc);
             ASMAtomicUoOrU64(&pVCpu->nem.s.fCtxChanged, HM_CHANGED_GUEST_APIC_TPR);

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -811 +811 @@
     /** @todo The GIC backend. Currently the padding helps keep alignment common
      *        between x86 and arm. */
-    uint8_t                            auPadding[4+4+232];
+    uint8_t                            auPadding[4+4+240];
 #endif
 } PDMICR3;
@@ -829 +829 @@
     /** @todo The GIC backend. Currently the padding helps keep alignment common
      *        between x86 and arm. */
-    uint8_t                            auPadding[232];
+    uint8_t                            auPadding[240];
 #endif
 } PDMICR0;
@@ -1634 +1634 @@
     bool volatile                   fNsUnchokeTimerArmed;
     /** Align aNsGroups on a cacheline.   */
-    bool                            afPadding2[19+16+25];
+    bool                            afPadding2[19+16+17];
     /** Number of network shaper groups.
      * @note Marked volatile to prevent re-reading after validation. */