Changeset 50575 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 25, 2014 1:07:16 PM (11 years ago)

Author:

vboxsync

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

92440

Message:

VMM: Added SSMR3RegisterStub and used it to provide saved state load-exec stubs for ignoring CSAM and PATM state when VBOX_WITH_RAW_MODE isn't defined or when HM is active.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/CSAM.cpp (modified) (3 diffs)
• VMMR3/PATM.cpp (modified) (1 diff)
• VMMR3/PATMSSM.cpp (modified) (1 diff)
• VMMR3/SSM.cpp (modified) (1 diff)
• VMMR3/VM.cpp (modified) (1 diff)
• include/PATMInternal.h (modified) (1 diff)

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

@@ -72 +72 @@
 static DECLCALLBACK(int) csamr3Save(PVM pVM, PSSMHANDLE pSSM);
 static DECLCALLBACK(int) csamr3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
-static DECLCALLBACK(int) csamR3LoadDummy(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
 static DECLCALLBACK(int) CSAMCodePageWriteHandler(PVM pVM, RTGCPTR GCPtr, void *pvPtr, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
 static DECLCALLBACK(int) CSAMCodePageInvalidate(PVM pVM, RTGCPTR GCPtr);
@@ -232 +231 @@
     {
         pVM->fCSAMEnabled = false;
-        return SSMR3RegisterInternal(pVM, "CSAM", 0, CSAM_SSM_VERSION, 0,
-                                     NULL, NULL, NULL,
-                                     NULL, NULL, NULL,
-                                     NULL, csamR3LoadDummy, NULL);
+        return SSMR3RegisterStub(pVM, "CSAM", 0);
     }
 
@@ -566 +562 @@
     /** @note we don't restore aDangerousInstr; it will be recreated automatically. */
     return VINF_SUCCESS;
-}
-
-
-/**
- * @callback_method_impl{FNSSMINTLOADEXEC, Dummy load function for HM mode.}
- */
-DECLCALLBACK(int) csamR3LoadDummy(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
-{
-    return SSMR3SkipToEndOfUnit(pSSM);
 }
 

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

@@ -146 +146 @@
     {
         pVM->fPATMEnabled = false;
-        return SSMR3RegisterInternal(pVM, "PATM", 0, PATM_SSM_VERSION, 0,
-                                     NULL, NULL, NULL,
-                                     NULL, NULL, NULL,
-                                     NULL, patmR3LoadDummy, NULL);
+        return SSMR3RegisterStub(pVM, "PATM", 0);
     }
 

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

@@ -804 +804 @@
 
 /**
- * @callback_method_impl{FNSSMINTLOADEXEC, Dummy load function for HM mode.}
- */
-DECLCALLBACK(int) patmR3LoadDummy(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
-{
-    return SSMR3SkipToEndOfUnit(pSSM);
-}
-
-
-/**
  * Execute state load operation.
  *

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

@@ -1468 +1468 @@
     }
     return rc;
+}
+
+
+/**
+ * @callback_method_impl{FNSSMINTLOADEXEC,
+ * Stub that skips the whole unit (see SSMR3RegisterStub).}
+ */
+static DECLCALLBACK(int) ssmR3LoadExecStub(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
+{
+    NOREF(pVM); NOREF(uVersion); NOREF(uPass);
+    return SSMR3SkipToEndOfUnit(pSSM);
+}
+
+
+/**
+ * Registers a stub state loader for working around legacy.
+ *
+ * This is used to deal with irelevant PATM and CSAM saved state units in HM
+ * mode and when built without raw-mode.
+ *
+ * @returns VBox status code.
+ * @param   pVM                 The VM handle.
+ * @param   pszName             Data unit name.
+ * @param   uInstance           Instance number.
+ */
+VMMR3DECL(int) SSMR3RegisterStub(PVM pVM, const char *pszName, uint32_t uInstance)
+{
+    return SSMR3RegisterInternal(pVM, pszName, uInstance, UINT32_MAX, 0,
+                                 NULL, NULL, NULL,
+                                 NULL, NULL, NULL,
+                                 NULL, ssmR3LoadExecStub, NULL);
 }
 

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

@@ -1166 +1166 @@
     if (RT_SUCCESS(rc))
         rc = PGMR3InitCompleted(pVM, enmWhat);
+#ifndef VBOX_WITH_RAW_MODE
+    if (RT_SUCCESS(rc))
+        rc = SSMR3RegisterStub(pVM, "CSAM", 0);
+    if (RT_SUCCESS(rc))
+        rc = SSMR3RegisterStub(pVM, "PATM", 0);
+#endif
     return rc;
 }

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

@@ -567 +567 @@
 DECLCALLBACK(int) patmR3Save(PVM pVM, PSSMHANDLE pSSM);
 DECLCALLBACK(int) patmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
-DECLCALLBACK(int) patmR3LoadDummy(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
 
 #ifdef IN_RING3