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

Timestamp:

Apr 8, 2015 11:31:47 AM (10 years ago)

Author:

vboxsync

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

99427

Message:

VMM/GIM: Allow dynamic enabling of #UD traps and per-VCPU hypercalls.

Location:

trunk/src/VBox/VMM/include

Files:

• GIMKvmInternal.h (modified) (1 diff)
• HMInternal.h (modified) (5 diffs)

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

@@ -261 +261 @@
 VMM_INT_DECL(VBOXSTRICTRC)      gimKvmReadMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue);
 VMM_INT_DECL(VBOXSTRICTRC)      gimKvmWriteMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t uRawValue);
-VMM_INT_DECL(bool)              gimKvmShouldTrapXcptUD(PVM pVM);
+VMM_INT_DECL(bool)              gimKvmShouldTrapXcptUD(PVMCPU pVCpu);
 VMM_INT_DECL(int)               gimKvmXcptUD(PVMCPU pVCpu, PCPUMCTX pCtx, PDISCPUSTATE pDis);
 

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

@@ -164 +164 @@
 #define HM_CHANGED_GUEST_EFER_MSR                RT_BIT(16)
 #define HM_CHANGED_GUEST_LAZY_MSRS               RT_BIT(17)     /* Shared */
+#define HM_CHANGED_GUEST_XCPT_INTERCEPTS         RT_BIT(18)
 /* VT-x specific state. */
-#define HM_CHANGED_VMX_GUEST_AUTO_MSRS           RT_BIT(18)
-#define HM_CHANGED_VMX_GUEST_ACTIVITY_STATE      RT_BIT(19)
-#define HM_CHANGED_VMX_GUEST_APIC_STATE          RT_BIT(20)
-#define HM_CHANGED_VMX_ENTRY_CTLS                RT_BIT(21)
-#define HM_CHANGED_VMX_EXIT_CTLS                 RT_BIT(22)
+#define HM_CHANGED_VMX_GUEST_AUTO_MSRS           RT_BIT(19)
+#define HM_CHANGED_VMX_GUEST_ACTIVITY_STATE      RT_BIT(20)
+#define HM_CHANGED_VMX_GUEST_APIC_STATE          RT_BIT(21)
+#define HM_CHANGED_VMX_ENTRY_CTLS                RT_BIT(22)
+#define HM_CHANGED_VMX_EXIT_CTLS                 RT_BIT(23)
 /* AMD-V specific state. */
-#define HM_CHANGED_SVM_GUEST_APIC_STATE          RT_BIT(18)
-#define HM_CHANGED_SVM_RESERVED1                 RT_BIT(19)
-#define HM_CHANGED_SVM_RESERVED2                 RT_BIT(20)
-#define HM_CHANGED_SVM_RESERVED3                 RT_BIT(21)
-#define HM_CHANGED_SVM_RESERVED4                 RT_BIT(22)
+#define HM_CHANGED_SVM_GUEST_APIC_STATE          RT_BIT(19)
+#define HM_CHANGED_SVM_RESERVED1                 RT_BIT(20)
+#define HM_CHANGED_SVM_RESERVED2                 RT_BIT(21)
+#define HM_CHANGED_SVM_RESERVED3                 RT_BIT(22)
+#define HM_CHANGED_SVM_RESERVED4                 RT_BIT(23)
 
 #define HM_CHANGED_ALL_GUEST                     (  HM_CHANGED_GUEST_CR0                \
@@ -195 +196 @@
                                                   | HM_CHANGED_GUEST_EFER_MSR           \
                                                   | HM_CHANGED_GUEST_LAZY_MSRS          \
+                                                  | HM_CHANGED_GUEST_XCPT_INTERCEPTS    \
                                                   | HM_CHANGED_VMX_GUEST_AUTO_MSRS      \
                                                   | HM_CHANGED_VMX_GUEST_ACTIVITY_STATE \
@@ -201 +203 @@
                                                   | HM_CHANGED_VMX_EXIT_CTLS)
 
-#define HM_CHANGED_HOST_CONTEXT                  RT_BIT(23)
+#define HM_CHANGED_HOST_CONTEXT                  RT_BIT(24)
 
 /* Bits shared between host and guest. */
@@ -343 +345 @@
     /** Set when TPR patching is active. */
     bool                        fTPRPatchingActive;
-    /** Whether #UD needs to be intercepted (required by certain GIM providers). */
-    bool                        fGIMTrapXcptUD;
-    /** Whether paravirt. hypercalls are enabled. */
-    bool                        fHypercallsEnabled;
-    bool                        u8Alignment[1];
+    bool                        u8Alignment[3];
 
     /** Host kernel flags that HM might need to know (SUPKERNELFEATURES_XXX). */
@@ -584 +582 @@
     /** Whether to preload the guest-FPU state to avoid #NM VM-exit overhead. */
     bool                        fPreloadGuestFpu;
+
+    /** Whether #UD needs to be intercepted (required by certain GIM providers). */
+    bool                        fGIMTrapXcptUD;
+    /** Whether paravirt. hypercalls are enabled. */
+    bool                        fHypercallsEnabled;
+    uint8_t                     u8Alignment0[6];
 
     /** World switch exit counter. */