Changeset 79628 in vbox for trunk/src/VBox

Timestamp:

Jul 9, 2019 5:45:01 AM (6 years ago)

Author:

vboxsync

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

131930

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 nits.

File:

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

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

@@ -16363 +16363 @@
 
     /* If this VM-exit occurred while delivering an event through the guest IDT, handle it accordingly. */
-    VBOXSTRICTRC rcStrict1 = hmR0VmxCheckExitDueToEventDelivery(pVCpu, pVmxTransient);
-    if (RT_LIKELY(rcStrict1 == VINF_SUCCESS))
+    VBOXSTRICTRC rcStrict = hmR0VmxCheckExitDueToEventDelivery(pVCpu, pVmxTransient);
+    if (RT_LIKELY(rcStrict == VINF_SUCCESS))
     {
         /*
@@ -16379 +16379 @@
     else
     {
-        if (rcStrict1 == VINF_HM_DOUBLE_FAULT)
-            rcStrict1 = VINF_SUCCESS;
-        return rcStrict1;
+        if (rcStrict == VINF_HM_DOUBLE_FAULT)
+            rcStrict = VINF_SUCCESS;
+        return rcStrict;
     }
 
@@ -16393 +16393 @@
     AssertRCReturn(rc, rc);
 
-    VBOXSTRICTRC rcStrict;
     PCEMEXITREC pExitRec = EMHistoryUpdateFlagsAndTypeAndPC(pVCpu,
                                                             EMEXIT_MAKE_FT(EMEXIT_F_KIND_EM | EMEXIT_F_HM, EMEXITTYPE_MMIO),
@@ -16423 +16422 @@
     {
         /*
-         * Frequent exit or something needing probing.  Get state and call EMHistoryExec.
+         * Frequent exit or something needing probing. Call EMHistoryExec.
          */
-        int rc2 = hmR0VmxImportGuestState(pVCpu, pVmcsInfo, IEM_CPUMCTX_EXTRN_MUST_MASK);
-        AssertRCReturn(rc2, rc2);
-
         Log4(("EptMisscfgExit/%u: %04x:%08RX64: %RGp -> EMHistoryExec\n",
               pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, GCPhys));
@@ -16452 +16448 @@
 
     /* If this VM-exit occurred while delivering an event through the guest IDT, handle it accordingly. */
-    VBOXSTRICTRC rcStrict1 = hmR0VmxCheckExitDueToEventDelivery(pVCpu, pVmxTransient);
-    if (RT_LIKELY(rcStrict1 == VINF_SUCCESS))
+    VBOXSTRICTRC rcStrict = hmR0VmxCheckExitDueToEventDelivery(pVCpu, pVmxTransient);
+    if (RT_LIKELY(rcStrict == VINF_SUCCESS))
     {
         /*
@@ -16464 +16460 @@
     else
     {
-        if (rcStrict1 == VINF_HM_DOUBLE_FAULT)
+        if (rcStrict == VINF_HM_DOUBLE_FAULT)
         {
             Assert(pVCpu->hm.s.Event.fPending);
-            rcStrict1 = VINF_SUCCESS;
-        }
-        return rcStrict1;
+            rcStrict = VINF_SUCCESS;
+        }
+        return rcStrict;
     }
 
@@ -16500 +16496 @@
               pCtx->cs.Sel, pCtx->rip));
 
-    VBOXSTRICTRC rcStrict2 = PGMR0Trap0eHandlerNestedPaging(pVM, pVCpu, PGMMODE_EPT, uErrorCode, CPUMCTX2CORE(pCtx), GCPhys);
+    rcStrict = PGMR0Trap0eHandlerNestedPaging(pVM, pVCpu, PGMMODE_EPT, uErrorCode, CPUMCTX2CORE(pCtx), GCPhys);
     TRPMResetTrap(pVCpu);
 
     /* Same case as PGMR0Trap0eHandlerNPMisconfig(). See comment above, @bugref{6043}. */
-    if (   rcStrict2 == VINF_SUCCESS
-        || rcStrict2 == VERR_PAGE_TABLE_NOT_PRESENT
-        || rcStrict2 == VERR_PAGE_NOT_PRESENT)
+    if (   rcStrict == VINF_SUCCESS
+        || rcStrict == VERR_PAGE_TABLE_NOT_PRESENT
+        || rcStrict == VERR_PAGE_NOT_PRESENT)
     {
         /* Successfully synced our nested page tables. */
@@ -16514 +16510 @@
     }
 
-    Log4Func(("EPT return to ring-3 rcStrict2=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict2)));
-    return rcStrict2;
+    Log4Func(("EPT return to ring-3 rcStrict2=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+    return rcStrict;
 }