Changeset 66667 in vbox

Timestamp:

Apr 25, 2017 5:14:36 AM (8 years ago)

Author:

vboxsync

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

115040

Message:

VMM: Nested Hw.virt: Added an fInterceptEvents SVM field in cpumctx.

Location:

trunk

Files:

• include/VBox/vmm/cpum.mac (modified) (1 diff)
• include/VBox/vmm/cpumctx.h (modified) (2 diffs)
• src/VBox/VMM/include/CPUMInternal.mac (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (1 diff)

trunk/include/VBox/vmm/cpum.mac

@@ -265 +265 @@
     .hwvirt.svm.cPauseFilter             resw    1
     .hwvirt.svm.cPauseFilterThreshold    resw    1
-    .hwvirt.svm.abPadding0               resb    3
+    .hwvirt.svm.fInterceptEvents         resb    1
+    .hwvirt.svm.abPadding0               resb    2
     .hwvirt.svm.pvMsrBitmapR0            RTR0PTR_RES 1
     .hwvirt.svm.pvMsrBitmapR3            RTR3PTR_RES 1

trunk/include/VBox/vmm/cpumctx.h

@@ -489 +489 @@
                 /** 1187 - Pause filter count. */
                 uint16_t            cPauseFilterThreshold;
-                /** 1189 - Padding. */
-                uint8_t             abPadding0[3];
+                /** 1189 - Whether the injected event is subject to event intercepts. */
+                uint8_t             fInterceptEvents;
+                /** 1190 - Padding. */
+                uint8_t             abPadding0[2];
                 /** 1192 - MSR permission bitmap - R0 ptr. */
                 R0PTRTYPE(void *)   pvMsrBitmapR0;
@@ -578 +580 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.cPauseFilter,          1185);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.cPauseFilterThreshold, 1187);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.fInterceptEvents,      1189);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvMsrBitmapR0,         1192);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvMsrBitmapR3,         HC_ARCH_BITS == 64 ? 1200 : 1196);

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

@@ -238 +238 @@
     .Guest.hwvirt.svm.cPauseFilter              resw    1
     .Guest.hwvirt.svm.cPauseFilterThreshold     resw    1
-    .Guest.hwvirt.svm.abPadding0                resb    3
+    .Guest.hwvirt.svm.fInterceptEvents          resb    1
+    .Guest.hwvirt.svm.abPadding0                resb    2
     .Guest.hwvirt.svm.pvMsrBitmapR0             RTR0PTR_RES 1
     .Guest.hwvirt.svm.pvMsrBitmapR3             RTR3PTR_RES 1
@@ -517 +518 @@
     .Hyper.hwvirt.svm.cPauseFilter              resw    1
     .Hyper.hwvirt.svm.cPauseFilterThreshold     resw    1
-    .Hyper.hwvirt.svm.abPadding0                resb    3
+    .Hyper.hwvirt.svm.fInterceptEvents          resb    1
+    .Hyper.hwvirt.svm.abPadding0                resb    2
     .Hyper.hwvirt.svm.pvMsrBitmapR0             RTR0PTR_RES 1
     .Hyper.hwvirt.svm.pvMsrBitmapR3             RTR3PTR_RES 1

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -139 +139 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.svm.cPauseFilter);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.svm.cPauseFilterThreshold);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.svm.fInterceptEvents);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.svm.pvMsrBitmapR0);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.svm.pvMsrBitmapR3);