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

Timestamp:

Jul 1, 2013 2:58:03 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HM: Alignment and fix an assertion in the new AMD-V code.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

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

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

@@ -189 +189 @@
     /** The guest's TPR value used for TPR shadowing. */
     uint8_t         u8GuestTpr;
-
+    /** Alignment. */
+    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. */
@@ -195 +199 @@
     /** Whether the TSC offset mode needs to be updated. */
     bool            fUpdateTscOffsetting;
-    /** Whether the TSC_AUX MSR needs restoring on #VMEXIT. */
-    bool            fRestoreTscAuxMsr;
 } SVMTRANSIENT, *PSVMTRANSIENT;
+AssertCompileMemberAlignment(SVMTRANSIENT, u64ExitCode,       sizeof(uint64_t));
+AssertCompileMemberAlignment(SVMTRANSIENT, fRestoreTscAuxMsr, sizeof(uint64_t));
 /** @}  */
 
@@ -2191 +2195 @@
 {
     Assert(!TRPMHasTrap(pVCpu));
+    Log4Func(("\n"));
 
     const bool fIntShadow = !!hmR0SvmGetGuestIntrShadow(pVCpu, pCtx);
@@ -2217 +2222 @@
         if (fInject)
         {
+            Log4(("Injecting pending HM event.\n"));
+
             hmR0SvmInjectEventVmcb(pVCpu, pVmcb, pCtx, &Event);
             pVCpu->hm.s.Event.fPending = false;
@@ -3446 +3453 @@
 
                 pVCpu->hm.s.Event.u64IntrInfo = pVmcb->ctrl.ExitIntInfo.u;
-                pVCpu->hm.s.Event.fPending = true;
-
                 hmR0SvmSetPendingEvent(pVCpu, &pVmcb->ctrl.ExitIntInfo, 0 /* GCPtrFaultAddress */);
 
@@ -4406 +4411 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitGuestMF);
 
-    int rc;
     if (!(pCtx->cr0 & X86_CR0_NE))
     {

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

@@ -178 +178 @@
     uint8_t         u8GuestTpr;
     /** Alignment. */
-    uint8_t         abAlignment0[6];
+    uint8_t         abAlignment0[7];
 
     /** The basic VM-exit reason. */
@@ -196 +196 @@
     bool            fVMEntryFailed;
     /** Alignment. */
-    uint8_t         abAlignment1[5];
+    uint8_t         abAlignment1[7];
 
     /** The VM-entry interruption-information field. */