Changeset 71970 in vbox

Timestamp:

Apr 23, 2018 9:04:53 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Nested hw.virt: Try run whatever VMRUN emulations in ring-0 although we'd be travelling back to ring-3 in many situations
due to PGM mode changes.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (2 diffs)
• VMMR0/HMSVMR0.cpp (modified) (2 diffs)

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

@@ -343 +343 @@
     LogFlow(("iemSvmVmrun\n"));
 
-#ifdef IN_RING0
-    /*
-     * Until PGM can handle switching the guest paging mode in ring-0,
-     * there's no point in trying to emulate VMRUN in ring-0 as we have
-     * to go back to ring-3 anyway, see @bugref{7243#c48}.
-     */
-    RT_NOREF(pVCpu, pCtx, cbInstr, GCPhysVmcb);
-    return VERR_IEM_ASPECT_NOT_IMPLEMENTED;
-#else
-
     /*
      * Cache the physical address of the VMCB for #VMEXIT exceptions.
@@ -835 +825 @@
     Log(("iemSvmVmrun: Failed to read nested-guest VMCB at %#RGp (rc=%Rrc) -> #VMEXIT\n", GCPhysVmcb, rc));
     return rc;
-#endif
 }
 

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

@@ -7819 +7819 @@
 {
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
-    /** @todo Stat. */
-    /* STAM_COUNTER_INC(&pVCpu->hm.s.StatExitVmrun); */
-#if 0
+
     VBOXSTRICTRC rcStrict;
     uint8_t const cbInstr = hmR0SvmGetInstrLengthHwAssist(pVCpu, pCtx, 3);
@@ -7832 +7830 @@
     }
     return VBOXSTRICTRC_VAL(rcStrict);
-#endif
-    return VERR_EM_INTERPRETER;
 }