Changeset 75611 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Nov 20, 2018 11:20:25 AM (6 years ago)

Author:

vboxsync

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

126785

Message:

VMM: Nested VMX: bugref:9180 Move the VMX APIC-access guest-physical page registration into IEM and got rid of the CPUM all context code that does not quite fit because we still have to declare the prototypes in the HM headers anyway, so just keep it in HM all context code for now.

Location:

trunk/src/VBox/VMM/include

Files:

• CPUMInternal.h (modified) (3 diffs)
• IEMInternal.h (modified) (4 diffs)

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

@@ -410 +410 @@
     /** The host MXCSR mask (determined at init). */
     uint32_t                fHostMxCsrMask;
-
-    /** The VMX APIC-access page handler type. */
-    PGMPHYSHANDLERTYPE      hVmxApicAccessPage;
-    uint8_t                 abPadding1[16];
+    uint8_t                 abPadding1[20];
 
     /** Host CPU feature information.
@@ -423 +420 @@
     /** Guest CPU info. */
     CPUMINFO                GuestInfo;
-
 
     /** The standard set of CpuId leaves. */
@@ -531 +527 @@
 PCPUMCPUIDLEAF      cpumCpuIdGetLeaf(PVM pVM, uint32_t uLeaf);
 PCPUMCPUIDLEAF      cpumCpuIdGetLeafEx(PVM pVM, uint32_t uLeaf, uint32_t uSubLeaf, bool *pfExactSubLeafHit);
-# ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-PGM_ALL_CB2_PROTO(FNPGMPHYSHANDLER) cpumVmxApicAccessPageHandler;
-# endif
 
 # ifdef IN_RING3

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

@@ -21 +21 @@
 #include <VBox/vmm/cpum.h>
 #include <VBox/vmm/iem.h>
+#include <VBox/vmm/pgm.h>
 #include <VBox/vmm/stam.h>
 #include <VBox/param.h>
@@ -558 +559 @@
     /** The CR2 for the current exception / interrupt. */
     uint64_t                uCurXcptCr2;
+    /** The VMX APIC-access page handler type. */
+    PGMPHYSHANDLERTYPE      hVmxApicAccessPage;
 
     /** @name Statistics
@@ -582 +585 @@
     /** Number of long jumps. */
     uint32_t                cLongJumps;
-    uint32_t                uAlignment6; /**< Alignment padding. */
     /** @} */
 
@@ -928 +930 @@
 } IEMACCESSCRX;
 
+# ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+PGM_ALL_CB2_PROTO(FNPGMPHYSHANDLER) iemVmxApicAccessPageHandler;
+# endif
 
 /**