Changeset 44035 in vbox for trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

Timestamp:

Dec 4, 2012 6:30:44 PM (12 years ago)

Author:

vboxsync

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

82473

Message:

VMM: hungarian again.

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (5 diffs)

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

@@ -533 +533 @@
 
     /* Set pending event state. */
-    pVCpu->hm.s.Event.uIntrInfo  = pEvent->au64[0];
+    pVCpu->hm.s.Event.u64IntrInfo  = pEvent->au64[0];
     pVCpu->hm.s.Event.fPending = true;
 }
@@ -593 +593 @@
         SVM_EVENT Event;
 
-        Log(("Reinjecting event %08x %08x at %RGv\n", pVCpu->hm.s.Event.uIntrInfo, pVCpu->hm.s.Event.uErrCode,
+        Log(("Reinjecting event %08x %08x at %RGv\n", pVCpu->hm.s.Event.u64IntrInfo, pVCpu->hm.s.Event.u32ErrCode,
              (RTGCPTR)pCtx->rip));
         STAM_COUNTER_INC(&pVCpu->hm.s.StatIntReinject);
-        Event.au64[0] = pVCpu->hm.s.Event.uIntrInfo;
+        Event.au64[0] = pVCpu->hm.s.Event.u64IntrInfo;
         hmR0SvmInjectEvent(pVCpu, pvVMCB, pCtx, &Event);
 
@@ -1792 +1792 @@
 
     /* Check if an injected event was interrupted prematurely. */
-    pVCpu->hm.s.Event.uIntrInfo = pvVMCB->ctrl.ExitIntInfo.au64[0];
+    pVCpu->hm.s.Event.u64IntrInfo = pvVMCB->ctrl.ExitIntInfo.au64[0];
     if (    pvVMCB->ctrl.ExitIntInfo.n.u1Valid
             /* we don't care about 'int xx' as the instruction will be restarted. */
         &&  pvVMCB->ctrl.ExitIntInfo.n.u3Type != SVM_EVENT_SOFTWARE_INT)
     {
-        Log(("Pending inject %RX64 at %RGv exit=%08x\n", pVCpu->hm.s.Event.uIntrInfo, (RTGCPTR)pCtx->rip, exitCode));
+        Log(("Pending inject %RX64 at %RGv exit=%08x\n", pVCpu->hm.s.Event.u64IntrInfo, (RTGCPTR)pCtx->rip, exitCode));
 
 #ifdef LOG_ENABLED
         SVM_EVENT Event;
-        Event.au64[0] = pVCpu->hm.s.Event.uIntrInfo;
+        Event.au64[0] = pVCpu->hm.s.Event.u64IntrInfo;
 
         if (    exitCode == SVM_EXIT_EXCEPTION_E
@@ -1813 +1813 @@
         /* Error code present? (redundant) */
         if (pvVMCB->ctrl.ExitIntInfo.n.u1ErrorCodeValid)
-            pVCpu->hm.s.Event.uErrCode  = pvVMCB->ctrl.ExitIntInfo.n.u32ErrorCode;
+            pVCpu->hm.s.Event.u32ErrCode  = pvVMCB->ctrl.ExitIntInfo.n.u32ErrorCode;
         else
-            pVCpu->hm.s.Event.uErrCode  = 0;
+            pVCpu->hm.s.Event.u32ErrCode  = 0;
     }
 #ifdef VBOX_WITH_STATISTICS
@@ -2739 +2739 @@
         {
             SVM_EVENT Event;
-            Event.au64[0] = pVCpu->hm.s.Event.uIntrInfo;
+            Event.au64[0] = pVCpu->hm.s.Event.u64IntrInfo;
 
             /* Caused by an injected interrupt. */