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

Timestamp:

Jul 31, 2019 2:30:19 PM (6 years ago)

Author:

vboxsync

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

132517

Message:

VMM: Kicking out raw-mode - GIM. bugref:9517

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• GIMAllHv.cpp (modified) (2 diffs)
• GIMAllKvm.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp

@@ -1364 +1364 @@
  * Whether we need to trap \#UD exceptions in the guest.
  *
- * We only need to trap \#UD exceptions for raw-mode guests when hypercalls are
- * enabled. For HM VMs, the hypercall would be handled via the
+ * We only needed to trap \#UD exceptions for the old raw-mode guests when
+ * hypercalls are enabled. For HM VMs, the hypercall would be handled via the
  * VMCALL/VMMCALL VM-exit.
  *
@@ -1372 +1372 @@
 VMM_INT_DECL(bool) gimHvShouldTrapXcptUD(PVMCPU pVCpu)
 {
-#ifdef VBOX_WITH_RAW_MODE
-    if (   VM_IS_RAW_MODE_ENABLED(pVCpu->CTX_SUFF(pVM))
-        && gimHvAreHypercallsEnabled(pVCpu))
-        return true;
-#else
     RT_NOREF(pVCpu);
-#endif
     return false;
 }

trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp

@@ -239 +239 @@
         {
             bool fEnable = RT_BOOL(uRawValue & MSR_GIM_KVM_SYSTEM_TIME_ENABLE_BIT);
-#ifdef IN_RING0
+#ifndef IN_RING3
             NOREF(fEnable); NOREF(pKvmCpu);
             gimR0KvmUpdateSystemTime(pVM, pVCpu);
-            return VINF_CPUM_R3_MSR_WRITE;
-#elif defined(IN_RC)
-            Assert(pVM->cCpus == 1);
-            if (fEnable)
-            {
-                RTCCUINTREG fEFlags  = ASMIntDisableFlags();
-                pKvmCpu->uTsc        = TMCpuTickGetNoCheck(pVCpu) | UINT64_C(1);
-                pKvmCpu->uVirtNanoTS = TMVirtualGetNoCheck(pVM)   | UINT64_C(1);
-                ASMSetFlags(fEFlags);
-            }
             return VINF_CPUM_R3_MSR_WRITE;
 #else /* IN_RING3 */
@@ -288 +278 @@
             }
             return VINF_SUCCESS;
-#endif
+#endif /* IN_RING3 */
         }
 
@@ -405 +395 @@
             PCGIMKVM pKvm = &pVM->gim.s.u.Kvm;
             if (   uDisOpcode != pKvm->uOpcodeNative
-                && !VM_IS_RAW_MODE_ENABLED(pVM)
                 && cbInstr == sizeof(pKvm->abOpcodeNative) )
             {