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

Timestamp:

Nov 21, 2017 6:49:59 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Nested Hw.virt: Fix lazy loading debug registers unintentionally while executing the nested-guest.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)

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

@@ -4183 +4183 @@
     hmR0SvmSaveGuestState(pVCpu, pMixedCtx, pVmcbNstGst);       /* Save the nested-guest state from the VMCB to the
                                                                    guest-CPU context. */
+
+    HMSvmNstGstVmExitNotify(pVCpu, pMixedCtx);                  /* Restore modified VMCB fields for now, see @bugref{7243#c52} .*/
 }
 #endif
@@ -6375 +6377 @@
      * Lazy DR0-3 loading.
      */
-    if (!pSvmTransient->fWasHyperDebugStateActive)
+    if (   !pSvmTransient->fWasHyperDebugStateActive
+#ifdef VBOX_WITH_NESTED_HWVIRT
+           && !CPUMIsGuestInSvmNestedHwVirtMode(pCtx)) /** @todo implement single-stepping when executing a nested-guest. */
+#endif
     {
         Assert(!DBGFIsStepping(pVCpu)); Assert(!pVCpu->hm.s.fSingleInstruction);