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

Timestamp:

Jun 27, 2019 9:53:17 AM (6 years ago)

Author:

vboxsync

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

131621

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Two more cases (Apic-access and task switch VM-exit) of zero'ing out the wrong struct (copy/paste bug). Fix passing the VM-exit reason to Mov DRx Vm-exit handling, remember 0 is a valid reason, so we can't easily verify if the reason is valid or otherwise if we fail to pass it.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

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

@@ -16850 +16850 @@
                 VMXVEXITINFO ExitInfo;
                 RT_ZERO(ExitInfo);
+                ExitInfo.uReason = pVmxTransient->uExitReason;
                 ExitInfo.cbInstr = pVmxTransient->cbInstr;
                 ExitInfo.u64Qual = pVmxTransient->uExitQual;
@@ -16946 +16947 @@
     VMXVEXITINFO ExitInfo;
     RT_ZERO(ExitInfo);
+    ExitInfo.uReason = pVmxTransient->uExitReason;
     ExitInfo.cbInstr = pVmxTransient->cbInstr;
     ExitInfo.u64Qual = pVmxTransient->uExitQual;
 
     VMXVEXITEVENTINFO ExitEventInfo;
-    RT_ZERO(ExitInfo);
+    RT_ZERO(ExitEventInfo);
     ExitEventInfo.uIdtVectoringInfo    = pVmxTransient->uIdtVectoringInfo;
     ExitEventInfo.uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;
@@ -17253 +17255 @@
         VMXVEXITINFO ExitInfo;
         RT_ZERO(ExitInfo);
+        ExitInfo.uReason = pVmxTransient->uExitReason;
         ExitInfo.cbInstr = pVmxTransient->cbInstr;
         ExitInfo.u64Qual = pVmxTransient->uExitQual;
@@ -17470 +17473 @@
     VMXVEXITINFO ExitInfo;
     RT_ZERO(ExitInfo);
+    ExitInfo.uReason = pVmxTransient->uExitReason;
     ExitInfo.cbInstr = pVmxTransient->cbInstr;
     ExitInfo.u64Qual = pVmxTransient->uExitQual;
 
     VMXVEXITEVENTINFO ExitEventInfo;
-    RT_ZERO(ExitInfo);
+    RT_ZERO(ExitEventInfo);
     ExitEventInfo.uIdtVectoringInfo    = pVmxTransient->uIdtVectoringInfo;
     ExitEventInfo.uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;