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

Timestamp:

Apr 30, 2012 12:01:52 PM (13 years ago)

Author:

vboxsync

Message:

HWVMXR0.cpp: If we should do something, mark it as @todo's and put the comment were the missing code should go.

File:

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

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

@@ -3495 +3495 @@
         /* Handle the pagefault trap for the nested shadow table. */
         rc = PGMR0Trap0eHandlerNestedPaging(pVM, pVCpu, PGMMODE_EPT, errCode, CPUMCTX2CORE(pCtx), GCPhys);
-        Log2(("PGMR0Trap0eHandlerNestedPaging %RGv returned %Rrc\n", (RTGCPTR)pCtx->rip, VBOXSTRICTRC_VAL(rc)));
-
-        /*
-         * Note! We probably should handle failure to get the instruction page (VERR_PAGE_NOT_PRESENT,
-         * VERR_PAGE_TABLE_NOT_PRESENT). See #6043.
-         */
         if (rc == VINF_SUCCESS)
         {   /* We've successfully synced our shadow pages, so let's just continue execution. */
@@ -3509 +3503 @@
             goto ResumeExecution;
         }
+        /** @todo We probably should handle failure to get the instruction page
+         *        (VERR_PAGE_NOT_PRESENT, VERR_PAGE_TABLE_NOT_PRESENT). See
+         *        @bugref{6043}. */
 
 #ifdef VBOX_STRICT
         if (rc != VINF_EM_RAW_EMULATE_INSTR)
-            LogFlow(("PGMTrap0eHandlerNestedPaging failed with %d\n", VBOXSTRICTRC_VAL(rc)));
+            LogFlow(("PGMTrap0eHandlerNestedPaging at %RGv failed with %Rrc\n", (RTGCPTR)pCtx->rip, VBOXSTRICTRC_VAL(rc)));
 #endif
         /* Need to go back to the recompiler to emulate the instruction. */
@@ -3547 +3544 @@
 
         rc = PGMR0Trap0eHandlerNPMisconfig(pVM, pVCpu, PGMMODE_EPT, CPUMCTX2CORE(pCtx), GCPhys, UINT32_MAX);
-
-        /*
-         * Note! We probably should handle failure to get the instruction page (VERR_PAGE_NOT_PRESENT,
-         * VERR_PAGE_TABLE_NOT_PRESENT). See #6043.
-         */
         if (rc == VINF_SUCCESS)
         {
@@ -3557 +3549 @@
             goto ResumeExecution;
         }
+        /** @todo We probably should handle failure to get the instruction page
+         *        (VERR_PAGE_NOT_PRESENT, VERR_PAGE_TABLE_NOT_PRESENT). See
+         *        @bugref{6043}. */
 
         Log2(("PGMR0Trap0eHandlerNPMisconfig(,,,%RGp) at %RGv -> %Rrc\n", GCPhys, (RTGCPTR)pCtx->rip, VBOXSTRICTRC_VAL(rc)));