Changeset 67944 in vbox

Timestamp:

Jul 13, 2017 9:49:05 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Nested HW.virt: CPUM fixes

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)

trunk/include/VBox/vmm/cpum.mac

@@ -267 +267 @@
     .hwvirt.svm.HostState              resb        184
     .hwvirt.svm.fGif                   resb          1
+    .hwvirt.svm.u8Padding0             resb          1
     .hwvirt.svm.cPauseFilter           resw          1
     .hwvirt.svm.cPauseFilterThreshold  resw          1
     .hwvirt.svm.fInterceptEvents       resb          1
-    .hwvirt.svm.abPadding1             resb          2
+    .hwvirt.svm.u8Padding1             resb          1
     .hwvirt.svm.pvMsrBitmapR0          RTR0PTR_RES   1
     .hwvirt.svm.pvMsrBitmapR3          RTR3PTR_RES   1

trunk/include/VBox/vmm/cpumctx.h

@@ -490 +490 @@
                 SVMHOSTSTATE        HostState;
                 /** 944 - Global interrupt flag. */
-                uint8_t             fGif;
-                /** 945 - Pause filter count. */
+                bool                fGif;
+                /** 945 - Padding. */
+                uint8_t             u8Padding0;
+                /** 946 - Pause filter count. */
                 uint16_t            cPauseFilter;
-                /** 947 - Pause filter count. */
+                /** 948 - Pause filter count. */
                 uint16_t            cPauseFilterThreshold;
-                /** 949 - Whether the injected event is subject to event intercepts. */
-                uint8_t             fInterceptEvents;
-                /** 950 - Padding. */
-                uint8_t             abPadding1[2];
+                /** 950 - Whether the injected event is subject to event intercepts. */
+                bool                fInterceptEvents;
+                /** 951 - Padding. */
+                uint8_t             u8Padding1;
                 /** 952 - MSR permission bitmap - R0 ptr. */
                 R0PTRTYPE(void *)   pvMsrBitmapR0;
@@ -585 +587 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.HostState,              760);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.fGif,                   944);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.cPauseFilter,           945);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.cPauseFilterThreshold,  947);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.fInterceptEvents,       949);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.cPauseFilter,           946);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.cPauseFilterThreshold,  948);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.fInterceptEvents,       950);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvMsrBitmapR0,          952);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) svm.pvMsrBitmapR3,          HC_ARCH_BITS == 64 ? 960 : 956);

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

@@ -240 +240 @@
     .Guest.hwvirt.svm.HostState              resb         184
     .Guest.hwvirt.svm.fGif                   resb         1
+    .Guest.hwvirt.svm.u8Padding0             resb         1
     .Guest.hwvirt.svm.cPauseFilter           resw         1
     .Guest.hwvirt.svm.cPauseFilterThreshold  resw         1
     .Guest.hwvirt.svm.fInterceptEvents       resb         1
-    .Guest.hwvirt.svm.abPadding1             resb         2
+    .Guest.hwvirt.svm.u8Padding1             resb         1
     .Guest.hwvirt.svm.pvMsrBitmapR0          RTR0PTR_RES  1
     .Guest.hwvirt.svm.pvMsrBitmapR3          RTR3PTR_RES  1
@@ -524 +525 @@
     .Hyper.hwvirt.svm.HostState              resb         184
     .Hyper.hwvirt.svm.fGif                   resb         1
+    .Hyper.hwvirt.svm.u8Padding0             resb         1
     .Hyper.hwvirt.svm.cPauseFilter           resw         1
     .Hyper.hwvirt.svm.cPauseFilterThreshold  resw         1
     .Hyper.hwvirt.svm.fInterceptEvents       resb         1
-    .Hyper.hwvirt.svm.abPadding1             resb         2
+    .Hyper.hwvirt.svm.u8Padding1             resb         1
     .Hyper.hwvirt.svm.pvMsrBitmapR0          RTR0PTR_RES  1
     .Hyper.hwvirt.svm.pvMsrBitmapR3          RTR3PTR_RES  1