Changeset 80387 in vbox for trunk/src/VBox

Timestamp:

Aug 22, 2019 2:44:42 PM (5 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Renamed u64GuestPendingDbgXcpt to u64GuestPendingDbgXcpts to better match the spec.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMVMXAll.cpp (modified) (1 diff)
• VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (6 diffs)
• VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• VMMR3/CPUM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

@@ -949 +949 @@
         LogRel(("  %srip                        = %#RX64\n",   pszPrefix, pVmcs->u64GuestRip.u));
         LogRel(("  %srflags                     = %#RX64\n",   pszPrefix, pVmcs->u64GuestRFlags.u));
-        LogRel(("  %sPending debug xcpts        = %#RX64\n",   pszPrefix, pVmcs->u64GuestPendingDbgXcpt.u));
+        LogRel(("  %sPending debug xcpts        = %#RX64\n",   pszPrefix, pVmcs->u64GuestPendingDbgXcpts.u));
         LogRel(("  %sSysEnter ESP               = %#RX64\n",   pszPrefix, pVmcs->u64GuestSysenterEsp.u));
         LogRel(("  %sSysEnter EIP               = %#RX64\n",   pszPrefix, pVmcs->u64GuestSysenterEip.u));

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -416 +416 @@
         /*    15 */ RT_UOFFSETOF(VMXVVMCS, u64GuestRip),
         /*    16 */ RT_UOFFSETOF(VMXVVMCS, u64GuestRFlags),
-        /*    17 */ RT_UOFFSETOF(VMXVVMCS, u64GuestPendingDbgXcpt),
+        /*    17 */ RT_UOFFSETOF(VMXVVMCS, u64GuestPendingDbgXcpts),
         /*    18 */ RT_UOFFSETOF(VMXVVMCS, u64GuestSysenterEsp),
         /*    19 */ RT_UOFFSETOF(VMXVVMCS, u64GuestSysenterEip),
@@ -791 +791 @@
     PVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(!(uGuestPendingDbgXcpts & VMX_VMCS_GUEST_PENDING_DEBUG_VALID_MASK));
-    pVmcs->u64GuestPendingDbgXcpt.u = uGuestPendingDbgXcpts;
+    pVmcs->u64GuestPendingDbgXcpts.u = uGuestPendingDbgXcpts;
 }
 
@@ -1509 +1509 @@
         /** @todo NSTVMX: also must exclude VM-exits caused by debug exceptions when
          *        block-by-MovSS is in effect. */
-        pVmcs->u64GuestPendingDbgXcpt.u = 0;
+        pVmcs->u64GuestPendingDbgXcpts.u = 0;
     }
 
@@ -5597 +5597 @@
      * Pending debug exceptions.
      */
-    uint64_t const uPendingDbgXcpt = IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fLongMode
-                                   ? pVmcs->u64GuestPendingDbgXcpt.u
-                                   : pVmcs->u64GuestPendingDbgXcpt.s.Lo;
-    if (!(uPendingDbgXcpt & ~VMX_VMCS_GUEST_PENDING_DEBUG_VALID_MASK))
+    uint64_t const uPendingDbgXcpts = IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fLongMode
+                                    ? pVmcs->u64GuestPendingDbgXcpts.u
+                                    : pVmcs->u64GuestPendingDbgXcpts.s.Lo;
+    if (!(uPendingDbgXcpts & ~VMX_VMCS_GUEST_PENDING_DEBUG_VALID_MASK))
     { /* likely */ }
     else
@@ -5610 +5610 @@
         if (   (pVmcs->u64GuestRFlags.u & X86_EFL_TF)
             && !(pVmcs->u64GuestDebugCtlMsr.u & MSR_IA32_DEBUGCTL_BTF)
-            && !(uPendingDbgXcpt & VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS))
+            && !(uPendingDbgXcpts & VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS))
             IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestPndDbgXcptBsTf);
 
         if (   (   !(pVmcs->u64GuestRFlags.u & X86_EFL_TF)
                 ||  (pVmcs->u64GuestDebugCtlMsr.u & MSR_IA32_DEBUGCTL_BTF))
-            && (uPendingDbgXcpt & VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS))
+            && (uPendingDbgXcpts & VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS))
             IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestPndDbgXcptBsNoTf);
     }
 
     /* We don't support RTM (Real-time Transactional Memory) yet. */
-    if (!(uPendingDbgXcpt & VMX_VMCS_GUEST_PENDING_DEBUG_RTM))
+    if (!(uPendingDbgXcpts & VMX_VMCS_GUEST_PENDING_DEBUG_RTM))
     { /* likely */ }
     else
@@ -6860 +6860 @@
     Assert(pVmcs);
 
-    bool fPendingDbgXcpt = RT_BOOL(pVmcs->u64GuestPendingDbgXcpt.u & (  VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS
-                                                                      | VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_EN_BP));
+    bool fPendingDbgXcpt = RT_BOOL(pVmcs->u64GuestPendingDbgXcpts.u & (  VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS
+                                                                       | VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_EN_BP));
     if (fPendingDbgXcpt)
     {

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

@@ -9985 +9985 @@
      * Currently just copy whatever the nested-guest provides us.
      */
-    uint64_t const uPendingDbgXcpt = pVmcsNstGst->u64GuestPendingDbgXcpt.u;
+    uint64_t const uPendingDbgXcpts = pVmcsNstGst->u64GuestPendingDbgXcpts.u;
 
     /*
@@ -10120 +10120 @@
     if (u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS)
         rc |= VMXWriteVmcs64(VMX_VMCS64_CTRL_APIC_ACCESSADDR_FULL, HCPhysApicAccess);
-    rc |= VMXWriteVmcsNw(VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS, uPendingDbgXcpt);
+    rc |= VMXWriteVmcsNw(VMX_VMCS_GUEST_PENDING_DEBUG_XCPTS, uPendingDbgXcpts);
     AssertRC(rc);
 

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -504 +504 @@
     SSMFIELD_ENTRY(       VMXVVMCS, u64GuestRip),
     SSMFIELD_ENTRY(       VMXVVMCS, u64GuestRFlags),
-    SSMFIELD_ENTRY(       VMXVVMCS, u64GuestPendingDbgXcpt),
+    SSMFIELD_ENTRY(       VMXVVMCS, u64GuestPendingDbgXcpts),
     SSMFIELD_ENTRY(       VMXVVMCS, u64GuestSysenterEsp),
     SSMFIELD_ENTRY(       VMXVVMCS, u64GuestSysenterEip),
@@ -3859 +3859 @@
         pHlp->pfnPrintf(pHlp, "  %srip                        = %#RX64\n",   pszPrefix, pVmcs->u64GuestRip.u);
         pHlp->pfnPrintf(pHlp, "  %srflags                     = %#RX64 %31s\n",pszPrefix, pVmcs->u64GuestRFlags.u, szEFlags);
-        pHlp->pfnPrintf(pHlp, "  %sPending debug xcpts        = %#RX64\n",   pszPrefix, pVmcs->u64GuestPendingDbgXcpt.u);
+        pHlp->pfnPrintf(pHlp, "  %sPending debug xcpts        = %#RX64\n",   pszPrefix, pVmcs->u64GuestPendingDbgXcpts.u);
         pHlp->pfnPrintf(pHlp, "  %sSysEnter ESP               = %#RX64\n",   pszPrefix, pVmcs->u64GuestSysenterEsp.u);
         pHlp->pfnPrintf(pHlp, "  %sSysEnter EIP               = %#RX64\n",   pszPrefix, pVmcs->u64GuestSysenterEip.u);