Changeset 67749 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jul 3, 2017 9:35:35 AM (7 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested Hw.virt: More flexible EFER transitions on VMRUN. Fixes 64-bit bootsector to work as nested-guest.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)

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

@@ -502 +502 @@
             /* EFER, CR0 and CR4. */
             uint64_t uValidEfer;
-            rc = CPUMQueryValidatedGuestEfer(pVM, VmcbNstGst.u64CR0, 0 /* uOldEfer */, VmcbNstGst.u64EFER, &uValidEfer);
+            rc = CPUMQueryValidatedGuestEfer(pVM, VmcbNstGst.u64CR0, VmcbNstGst.u64EFER, VmcbNstGst.u64EFER, &uValidEfer);
             if (RT_FAILURE(rc))
             {
-                Log(("iemSvmVmrun: EFER invalid uOldEfer=%#RX64 uValidEfer=%#RX64 -> #VMEXIT\n", VmcbNstGst.u64EFER, uValidEfer));
+                Log(("iemSvmVmrun: EFER invalid uOldEfer=%#RX64 -> #VMEXIT\n", VmcbNstGst.u64EFER));
                 return iemSvmVmexit(pVCpu, pCtx, SVM_EXIT_INVALID, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
             }