Changeset 72460 in vbox

Timestamp:

Jun 6, 2018 11:16:12 AM (7 years ago)

Author:

vboxsync

Message:

GIM/Hv: Need to restore hypercall instruction enable state on load. (KVM always enables hypercall instructions, so nothing to do there.) bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/GIM.cpp (modified) (3 diffs)
• VMMR3/GIMHv.cpp (modified) (1 diff)
• include/GIMHvInternal.h (modified) (1 diff)

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

@@ -75 +75 @@
 static FNSSMINTSAVEEXEC  gimR3Save;
 static FNSSMINTLOADEXEC  gimR3Load;
+static FNSSMINTLOADDONE  gimR3LoadDone;
 
 
@@ -104 +105 @@
                                    NULL /* pfnLivePrep */, NULL /* pfnLiveExec */, NULL /* pfnLiveVote*/,
                                    NULL /* pfnSavePrep */, gimR3Save,              NULL /* pfnSaveDone */,
-                                   NULL /* pfnLoadPrep */, gimR3Load,              NULL /* pfnLoadDone */);
+                                   NULL /* pfnLoadPrep */, gimR3Load,              gimR3LoadDone);
     if (RT_FAILURE(rc))
         return rc;
@@ -321 +322 @@
 
     return VINF_SUCCESS;
+}
+
+
+/**
+ * @callback_method_impl{FNSSMINTLOADDONE}
+ */
+static DECLCALLBACK(int) gimR3LoadDone(PVM pVM, PSSMHANDLE pSSM)
+{
+    switch (pVM->gim.s.enmProviderId)
+    {
+        case GIMPROVIDERID_HYPERV:
+            return gimR3HvLoadDone(pVM, pSSM);
+
+        default:
+            return VINF_SUCCESS;
+    }
 }
 

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

@@ -1025 +1025 @@
 
     return rc;
+}
+
+
+/**
+ * Hyper-V load-done callback.
+ *
+ * @returns VBox status code.
+ * @param   pVM             The cross context VM structure.
+ * @param   pSSM            The saved state handle.
+ */
+VMMR3_INT_DECL(int) gimR3HvLoadDone(PVM pVM, PSSMHANDLE pSSM)
+{
+    if (RT_SUCCESS(SSMR3HandleGetStatus(pSSM)))
+    {
+        /*
+         * Update EM on whether MSR_GIM_HV_GUEST_OS_ID allows hypercall instructions.
+         */
+        if (pVM->gim.s.u.Hv.u64GuestOsIdMsr)
+            for (VMCPUID i = 0; i < pVM->cCpus; i++)
+                VMMHypercallsEnable(&pVM->aCpus[i]);
+        else
+            for (VMCPUID i = 0; i < pVM->cCpus; i++)
+                VMMHypercallsDisable(&pVM->aCpus[i]);
+    }
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/VMM/include/GIMHvInternal.h

@@ -1339 +1339 @@
 VMMR3_INT_DECL(int)             gimR3HvSave(PVM pVM, PSSMHANDLE pSSM);
 VMMR3_INT_DECL(int)             gimR3HvLoad(PVM pVM, PSSMHANDLE pSSM);
+VMMR3_INT_DECL(int)             gimR3HvLoadDone(PVM pVM, PSSMHANDLE pSSM);
 VMMR3_INT_DECL(int)             gimR3HvGetDebugSetup(PVM pVM, PGIMDEBUGSETUP pDbgSetup);