Changeset 32135 in vbox

Timestamp:

Aug 31, 2010 12:24:28 PM (15 years ago)

Author:

vboxsync

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

65410

Message:

Checkpoint PDM helper

Location:

trunk

Files:

• include/VBox/ftm.h (modified) (1 diff)
• include/VBox/pdmdrv.h (modified) (5 diffs)
• src/VBox/VMM/PDMDriver.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/FTMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMGC/PDMGCDevice.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (2 diffs)

trunk/include/VBox/ftm.h

@@ -35 +35 @@
  * @{
  */
+
+/**
+ * Fault tolerance checkpoint type.
+ */
+typedef enum FTMCHECKPOINTTYPE
+{
+    FTMCHECKPOINTTYPE_NETWORK,
+    FTMCHECKPOINTTYPE_STORAGE,
+    FTMCHECKPOINTTYPE_32BIT_HACK = 0x7fffffff
+} FTMCHECKPOINTTYPE;
+
 VMMDECL(bool)  FTMIsDeltaLoadSaveActive(PVM pVM);
+VMMDECL(int)   FTMSetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmType);
 
 #ifdef IN_RING3

trunk/include/VBox/pdmdrv.h

@@ -40 +40 @@
 #include <VBox/mm.h>
 #include <VBox/err.h>
+#include <VBox/ftm.h>
 #include <iprt/stdarg.h>
 
@@ -628 +629 @@
     DECLRCCALLBACKMEMBER(bool, pfnAssertOther,(PPDMDRVINS pDrvIns, const char *pszFile, unsigned iLine, const char *pszFunction));
 
+    /**
+     * Notify FTM about a checkpoint occurance
+     *
+     * @param   pDrvIns             The driver instance.
+     * @param   enmType             Checkpoint type
+     * @thread  Any
+     */
+    DECLRCCALLBACKMEMBER(int, pfnFTSetCheckpoint,(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType));
+
     /** Just a safety precaution. */
     uint32_t                        u32TheEnd;
 } PDMDRVHLPRC;
 /** Current PDMDRVHLPRC version number. */
-#define PDM_DRVHLPRC_VERSION                    PDM_VERSION_MAKE(0xf0f9, 1, 0)
+#define PDM_DRVHLPRC_VERSION                    PDM_VERSION_MAKE(0xf0fA, 1, 0)
 
 
@@ -715 +725 @@
     DECLR0CALLBACKMEMBER(bool, pfnAssertOther,(PPDMDRVINS pDrvIns, const char *pszFile, unsigned iLine, const char *pszFunction));
 
+    /**
+     * Notify FTM about a checkpoint occurance
+     *
+     * @param   pDrvIns             The driver instance.
+     * @param   enmType             Checkpoint type
+     * @thread  Any
+     */
+    DECLR0CALLBACKMEMBER(int, pfnFTSetCheckpoint,(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType));
+
     /** Just a safety precaution. */
     uint32_t                        u32TheEnd;
 } PDMDRVHLPR0;
 /** Current DRVHLP version number. */
-#define PDM_DRVHLPR0_VERSION                    PDM_VERSION_MAKE(0xf0f8, 1, 0)
+#define PDM_DRVHLPR0_VERSION                    PDM_VERSION_MAKE(0xf0f9, 1, 0)
 
 
@@ -1196 +1215 @@
     DECLR3CALLBACKMEMBER(int, pfnCallR0,(PPDMDRVINS pDrvIns, uint32_t uOperation, uint64_t u64Arg));
 
+    /**
+     * Notify FTM about a checkpoint occurance
+     *
+     * @param   pDrvIns             The driver instance.
+     * @param   enmType             Checkpoint type
+     * @thread  Any
+     */
+    DECLR3CALLBACKMEMBER(int, pfnFTSetCheckpoint,(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType));
+
     /** Just a safety precaution. */
     uint32_t                        u32TheEnd;
 } PDMDRVHLPR3;
 /** Current DRVHLP version number. */
-#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 1, 0)
+#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fc, 1, 0)
 
 #endif /* IN_RING3 */
@@ -1279 +1307 @@
 #endif
 
+/**
+ * @copydoc PDMDRVHLP::pfnFTSetCheckpoint
+ */
+DECLINLINE(int) PDMDrvHlpFTSetCheckpoint(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType)
+{
+    return pDrvIns->CTX_SUFF(pHlp)->pfnFTSetCheckpoint(pDrvIns, enmType);
+}
 
 #ifdef IN_RING3

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -1352 +1352 @@
 }
 
+/** @interface_method_impl{PDMDRVHLP,pfnFTSetCheckpoint} */
+static DECLCALLBACK(int) pdmR3DrvHlp_FTSetCheckpoint(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    return FTMSetCheckpoint(pDrvIns->Internal.s.pVMR3, enmType);
+}
 
 /**
@@ -1392 +1398 @@
     pdmR3DrvHlp_CritSectInit,
     pdmR3DrvHlp_CallR0,
+    pdmR3DrvHlp_FTSetCheckpoint,
     PDM_DRVHLPR3_VERSION /* u32TheEnd */
 };

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

@@ -37 +37 @@
  *
  * @param   pVM         The VM to operate on.
+ * @param   enmType     Checkpoint type
  */
-VMMDECL(int) FTMSetCheckpoint(PVM pVM)
+VMMDECL(int)   FTMSetCheckpoint(PVM pVM, FTMCHECKPOINTTYPE enmType)
 {
     if (!pVM->fFaultTolerantMaster)

trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

@@ -684 +684 @@
 }
 
+/** @interface_method_impl{PDMDRVHLPRC,pfnFTSetCheckpoint} */
+static DECLCALLBACK(int) pdmRCDrvHlp_FTSetCheckpoint(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    return FTMSetCheckpoint(pDrvIns->Internal.s.pVMRC, enmType);
+}
 
 /**
@@ -697 +703 @@
     pdmRCDrvHlp_AssertEMT,
     pdmRCDrvHlp_AssertOther,
+    pdmRCDrvHlp_FTSetCheckpoint,
     PDM_DRVHLPRC_VERSION
 };

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

@@ -716 +716 @@
 }
 
+/** @interface_method_impl{PDMDRVHLPR0,pfnFTSetCheckpoint} */
+static DECLCALLBACK(int) pdmR0DrvHlp_FTSetCheckpoint(PPDMDRVINS pDrvIns, FTMCHECKPOINTTYPE enmType)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    return FTMSetCheckpoint(pDrvIns->Internal.s.pVMR0, enmType);
+}
 
 /**
@@ -729 +735 @@
     pdmR0DrvHlp_AssertEMT,
     pdmR0DrvHlp_AssertOther,
+    pdmR0DrvHlp_FTSetCheckpoint,
     PDM_DRVHLPRC_VERSION
 };