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

Timestamp:

Jun 6, 2018 2:24:04 PM (7 years ago)

Author:

vboxsync

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

122946

Message:

EM,IEM,HM: Consolidated VMMHypercallsDisable/VMMHypercallsEnable into EMSetHypercallInstructionsEnabled and made the information available thru EMAreHypercallInstructionsEnabled(). Adjusted the vmmcall implementation so it works without HM. bugref:9044

Location:

trunk/src/VBox/VMM/include

Files:

• EMInternal.h (modified) (1 diff)
• HMInternal.h (modified) (2 diffs)
• HMInternal.mac (modified) (1 diff)

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

@@ -345 +345 @@
     bool                    fForceRAW;
 
-    uint8_t                 u8Padding[3];
+    /** Set if hypercall instruction VMMCALL (AMD) & VMCALL (Intel) are enabled.
+     * GIM sets this and the execution managers queries it.  Not saved, as GIM
+     * takes care of that bit too.  */
+    bool                    fHypercallEnabled;
+
+    /** Explicit padding. */
+    uint8_t                 abPadding[2];
 
     /** The number of instructions we've executed in IEM since switching to the

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

@@ -727 +727 @@
     /** Whether \#UD needs to be intercepted (required by certain GIM providers). */
     bool                        fGIMTrapXcptUD;
-    /** Whether paravirt. hypercalls are enabled. */
-    bool                        fHypercallsEnabled;
-    uint8_t                     u8Alignment0[2];
+    uint8_t                     u8Alignment0[3];
 
     /** World switch exit counter. */
@@ -1157 +1155 @@
 #endif /* IN_RING0 */
 
+int hmSvmEmulateMovTpr(PVMCPU pVCpu, PCPUMCTX pCtx);
+
 /** @} */
 

trunk/src/VBox/VMM/include/HMInternal.mac

@@ -79 +79 @@
 
         .fGIMTrapXcptUD         resb    1
-        .fHypercallsEnabled     resb    1
         alignb 8