Changeset 96746 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Sep 15, 2022 4:45:53 PM (2 years ago)

Author:

vboxsync

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

153633

Message:

VMM/HMVMXR0: Nested VMX: bugref:10092 Fix VMXR0GetExitAuxInfo.

File:

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

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

@@ -4858 +4858 @@
     {
         AssertCompile(sizeof(fWhat) == sizeof(pVmxTransient->fVmcsFieldsRead));
-        fWhat &= ~pVmxTransient->fVmcsFieldsRead;
 
         /* The exit reason is always available. */
@@ -4866 +4865 @@
         {
             vmxHCReadExitQualVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->u64Qual = pVmxTransient->uExitQual;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_EXIT_QUALIFICATION;
-            pVmxExitAux->u64Qual = pVmxTransient->uExitQual;
+#endif
         }
 
@@ -4873 +4874 @@
         {
             vmxHCReadIdtVectoringInfoVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->uIdtVectoringInfo = pVmxTransient->uIdtVectoringInfo;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_IDT_VECTORING_INFO;
-            pVmxExitAux->uIdtVectoringInfo = pVmxTransient->uIdtVectoringInfo;
+#endif
         }
 
@@ -4880 +4883 @@
         {
             vmxHCReadIdtVectoringErrorCodeVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_IDT_VECTORING_ERROR_CODE;
-            pVmxExitAux->uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;
+#endif
         }
 
@@ -4887 +4892 @@
         {
             vmxHCReadExitInstrLenVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->cbInstr = pVmxTransient->cbExitInstr;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_EXIT_INSTR_LEN;
-            pVmxExitAux->cbInstr = pVmxTransient->cbExitInstr;
+#endif
         }
 
@@ -4894 +4901 @@
         {
             vmxHCReadExitIntInfoVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->uExitIntInfo = pVmxTransient->uExitIntInfo;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_EXIT_INTERRUPTION_INFO;
-            pVmxExitAux->uExitIntInfo = pVmxTransient->uExitIntInfo;
+#endif
         }
 
@@ -4901 +4910 @@
         {
             vmxHCReadExitIntErrorCodeVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->uExitIntErrCode = pVmxTransient->uExitIntErrorCode;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_EXIT_INTERRUPTION_ERROR_CODE;
-            pVmxExitAux->uExitIntErrCode = pVmxTransient->uExitIntErrorCode;
+#endif
         }
 
@@ -4908 +4919 @@
         {
             vmxHCReadExitInstrInfoVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->InstrInfo.u = pVmxTransient->ExitInstrInfo.u;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_EXIT_INSTR_INFO;
-            pVmxExitAux->InstrInfo.u = pVmxTransient->ExitInstrInfo.u;
+#endif
         }
 
@@ -4915 +4928 @@
         {
             vmxHCReadGuestLinearAddrVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->u64GuestLinearAddr = pVmxTransient->uGuestLinearAddr;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_GUEST_LINEAR_ADDR;
-            pVmxExitAux->u64GuestLinearAddr = pVmxTransient->uGuestLinearAddr;
+#endif
         }
 
@@ -4922 +4937 @@
         {
             vmxHCReadGuestPhysicalAddrVmcs(pVCpu, pVmxTransient);
+            pVmxExitAux->u64GuestPhysAddr = pVmxTransient->uGuestPhysicalAddr;
+#ifdef VBOX_STRICT
             fWhat &= ~HMVMX_READ_GUEST_PHYSICAL_ADDR;
-            pVmxExitAux->u64GuestPhysAddr = pVmxTransient->uGuestPhysicalAddr;
+#endif
         }
 
         if (fWhat & HMVMX_READ_GUEST_PENDING_DBG_XCPTS)
         {
-            fWhat &= ~HMVMX_READ_GUEST_PENDING_DBG_XCPTS;
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
             vmxHCReadGuestPendingDbgXctps(pVCpu, pVmxTransient);
@@ -4934 +4950 @@
 #else
             pVmxExitAux->u64GuestPendingDbgXcpts = 0;
+#endif
+#ifdef VBOX_STRICT
+            fWhat &= ~HMVMX_READ_GUEST_PENDING_DBG_XCPTS;
 #endif
         }