Changeset 48700 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 26, 2013 7:34:12 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0, HMSVMR0: Alignment and assert.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -205 +205 @@
     uint8_t         abAlignment0[7];
 
-    /** Whether the TSC_AUX MSR needs restoring on #VMEXIT. */
-    bool            fRestoreTscAuxMsr;
-    /** Whether the #VMEXIT was caused by a page-fault during delivery of a
-     *  contributary exception or a page-fault. */
-    bool            fVectoringPF;
-    /** Whether the TSC offset mode needs to be updated. */
-    bool            fUpdateTscOffsetting;
     /** Whether the guest FPU state was active at the time of #VMEXIT. */
     bool            fWasGuestFPUStateActive;
@@ -218 +211 @@
     /** Whether the hyper debug state was active at the time of #VMEXIT. */
     bool            fWasHyperDebugStateActive;
+    /** Whether the TSC offset mode needs to be updated. */
+    bool            fUpdateTscOffsetting;
+    /** Whether the TSC_AUX MSR needs restoring on #VMEXIT. */
+    bool            fRestoreTscAuxMsr;
+    /** Whether the #VMEXIT was caused by a page-fault during delivery of a
+     *  contributary exception or a page-fault. */
+    bool            fVectoringPF;
 } SVMTRANSIENT, *PSVMTRANSIENT;
-AssertCompileMemberAlignment(SVMTRANSIENT, u64ExitCode,       sizeof(uint64_t));
-AssertCompileMemberAlignment(SVMTRANSIENT, fRestoreTscAuxMsr, sizeof(uint64_t));
+AssertCompileMemberAlignment(SVMTRANSIENT, u64ExitCode,             sizeof(uint64_t));
+AssertCompileMemberAlignment(SVMTRANSIENT, fWasGuestFPUStateActive, sizeof(uint64_t));
 /** @}  */
 

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -257 +257 @@
     /** Mask of currently read VMCS fields; HMVMX_UPDATED_TRANSIENT_*. */
     uint32_t        fVmcsFieldsRead;
-    /** Whether TSC-offsetting should be setup before VM-entry. */
-    bool            fUpdateTscOffsettingAndPreemptTimer;
-    /** Whether the VM-exit was caused by a page-fault during delivery of a
-     *  contributory exception or a page-fault. */
-    bool            fVectoringPF;
+
     /** Whether the guest FPU was active at the time of VM-exit. */
     bool            fWasGuestFPUStateActive;
@@ -268 +264 @@
     /** Whether the hyper debug state was active at the time of VM-exit. */
     bool            fWasHyperDebugStateActive;
+    /** Whether TSC-offsetting should be setup before VM-entry. */
+    bool            fUpdateTscOffsettingAndPreemptTimer;
+    /** Whether the VM-exit was caused by a page-fault during delivery of a
+     *  contributory exception or a page-fault. */
+    bool            fVectoringPF;
 } VMXTRANSIENT;
-AssertCompileMemberAlignment(VMXTRANSIENT, uExitReason,    sizeof(uint64_t));
-AssertCompileMemberAlignment(VMXTRANSIENT, uExitIntrInfo,  sizeof(uint64_t));
-AssertCompileMemberAlignment(VMXTRANSIENT, uEntryIntrInfo, sizeof(uint64_t));
+AssertCompileMemberAlignment(VMXTRANSIENT, uExitReason,             sizeof(uint64_t));
+AssertCompileMemberAlignment(VMXTRANSIENT, uExitIntrInfo,           sizeof(uint64_t));
+AssertCompileMemberAlignment(VMXTRANSIENT, uEntryIntrInfo,          sizeof(uint64_t));
+AssertCompileMemberAlignment(VMXTRANSIENT, fWasGuestFPUStateActive, sizeof(uint64_t));
 AssertCompileMemberSize(VMXTRANSIENT, ExitInstrInfo, sizeof(uint32_t));
 /** Pointer to VMX transient state. */