Changeset 72462 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 6, 2018 2:24:04 PM (7 years ago)

Author:

vboxsync

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

122946

Message:

EM,IEM,HM: Consolidated VMMHypercallsDisable/VMMHypercallsEnable into EMSetHypercallInstructionsEnabled and made the information available thru EMAreHypercallInstructionsEnabled(). Adjusted the vmmcall implementation so it works without HM. bugref:9044

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GIMHv.cpp (modified) (2 diffs)
• GIMKvm.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -28 +28 @@
 #include <VBox/vmm/hm.h>
 #include <VBox/vmm/pdmapi.h>
+#include <VBox/vmm/em.h>
 #include "GIMInternal.h"
 #include <VBox/vmm/vm.h>
@@ -1044 +1045 @@
         if (pVM->gim.s.u.Hv.u64GuestOsIdMsr)
             for (VMCPUID i = 0; i < pVM->cCpus; i++)
-                VMMHypercallsEnable(&pVM->aCpus[i]);
+                EMSetHypercallInstructionsEnabled(&pVM->aCpus[i], true);
         else
             for (VMCPUID i = 0; i < pVM->cCpus; i++)
-                VMMHypercallsDisable(&pVM->aCpus[i]);
+                EMSetHypercallInstructionsEnabled(&pVM->aCpus[i], false);
     }
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp

@@ -26 +26 @@
 #include <VBox/vmm/pdmapi.h>
 #include <VBox/vmm/ssm.h>
+#include <VBox/vmm/em.h>
 #include "GIMInternal.h"
 #include <VBox/vmm/vm.h>
@@ -159 +160 @@
      */
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
-        VMMHypercallsEnable(&pVM->aCpus[i]);
+        EMSetHypercallInstructionsEnabled(&pVM->aCpus[i], true);
 
     if (ASMIsAmdCpu())