Changeset 79718 in vbox

Timestamp:

Jul 12, 2019 6:37:43 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Align uDiagAux on 8-byte boundary, Windows warning/build failure.

Location:

trunk

Files:

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

trunk/include/VBox/vmm/cpumctx.h

@@ -568 +568 @@
                 /** 0x2f8 - Last emulated VMX instruction/VM-exit diagnostic. */
                 VMXVDIAG                enmDiag;
-                /** 0x2fc - Last emulated VMX instruction/VM-exit diagnostic auxiliary
+                /** 0x2fc - VMX abort reason. */
+                VMXABORT                enmAbort;
+                /** 0x300 - Last emulated VMX instruction/VM-exit diagnostic auxiliary
                  *  information field. */
                 uint64_t                uDiagAux;
-                /** 0x304 - VMX abort reason. */
-                VMXABORT                enmAbort;
                 /** 0x308 - VMX abort auxiliary information field. */
                 uint32_t                uAbortAux;
@@ -810 +810 @@
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.GCPhysShadowVmcs,            0x2f0);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.enmDiag,                     0x2f8);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.uDiagAux,                    0x2fc);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.enmAbort,                    0x304);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.enmAbort,                    0x2fc);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.uDiagAux,                    0x300);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.uAbortAux,                   0x308);
 AssertCompileMemberOffset(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.fInVmxRootMode,              0x30c);

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

@@ -149 +149 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.GCPhysVmcs);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.enmDiag);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.enmAbort);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uDiagAux);
-    GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.enmAbort);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.uAbortAux);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.fInVmxRootMode);