Changeset 22480 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

Aug 26, 2009 5:14:13 PM (16 years ago)

Author:

vboxsync

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

51500

Message:

SSM,VMM,Devices,Main,VBoxBFE: Live snapshot/migration SSM API adjustments.

File:

• trunk/src/VBox/VMM/testcase/tstSSM.cpp (modified) (14 diffs)

trunk/src/VBox/VMM/testcase/tstSSM.cpp

@@ -186 +186 @@
  * @param   pDevIns         Device instance of the device which registered the data unit.
  * @param   pSSM            SSM operation handle.
- */
-DECLCALLBACK(int) Item01Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t u32Version)
-{
-    if (u32Version != 0)
-    {
-        RTPrintf("Item01: u32Version=%#x, expected 0\n", u32Version);
+ * @param   uVersion        The data layout version.
+ * @param   uPhase          The data phase.
+ */
+DECLCALLBACK(int) Item01Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPhase)
+{
+    if (uVersion != 0)
+    {
+        RTPrintf("Item01: uVersion=%#x, expected 0\n", uVersion);
         return VERR_GENERAL_FAILURE;
     }
@@ -340 +342 @@
  * @param   pDevIns         Device instance of the device which registered the data unit.
  * @param   pSSM            SSM operation handle.
- */
-DECLCALLBACK(int) Item02Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t u32Version)
-{
-    if (u32Version != 0)
-    {
-        RTPrintf("Item02: u32Version=%#x, expected 0\n", u32Version);
+ * @param   uVersion        The data layout version.
+ * @param   uPhase          The data phase.
+ */
+DECLCALLBACK(int) Item02Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPhase)
+{
+    if (uVersion != 0)
+    {
+        RTPrintf("Item02: uVersion=%#x, expected 0\n", uVersion);
         return VERR_GENERAL_FAILURE;
     }
@@ -452 +456 @@
  * @param   pDevIns         Device instance of the device which registered the data unit.
  * @param   pSSM            SSM operation handle.
- */
-DECLCALLBACK(int) Item03Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t u32Version)
-{
-    if (u32Version != 123)
-    {
-        RTPrintf("Item03: u32Version=%#x, expected 123\n", u32Version);
+ * @param   uVersion        The data layout version.
+ * @param   uPhase          The data phase.
+ */
+DECLCALLBACK(int) Item03Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPhase)
+{
+    if (uVersion != 123)
+    {
+        RTPrintf("Item03: uVersion=%#x, expected 123\n", uVersion);
         return VERR_GENERAL_FAILURE;
     }
@@ -556 +562 @@
  * @param   pDevIns         Device instance of the device which registered the data unit.
  * @param   pSSM            SSM operation handle.
- */
-DECLCALLBACK(int) Item04Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t u32Version)
-{
-    if (u32Version != 42)
-    {
-        RTPrintf("Item04: u32Version=%#x, expected 42\n", u32Version);
+ * @param   uVersion        The data layout version.
+ * @param   uPhase          The data phase.
+ */
+DECLCALLBACK(int) Item04Load(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPhase)
+{
+    if (uVersion != 42)
+    {
+        RTPrintf("Item04: uVersion=%#x, expected 42\n", uVersion);
         return VERR_GENERAL_FAILURE;
     }
@@ -698 +706 @@
      */
     rc = SSMR3RegisterDevice(pVM, NULL, "SSM Testcase Data Item no.1 (all types)", 1, 0, 256, NULL,
-        NULL, Item01Save, NULL,
-        NULL, Item01Load, NULL);
+                             NULL, NULL, NULL,
+                             NULL, Item01Save, NULL,
+                             NULL, Item01Load, NULL);
     if (RT_FAILURE(rc))
     {
@@ -707 +716 @@
 
     rc = SSMR3RegisterDevice(pVM, NULL, "SSM Testcase Data Item no.2 (rand mem)", 2, 0, _1M * 8, NULL,
-        NULL, Item02Save, NULL,
-        NULL, Item02Load, NULL);
+                             NULL, NULL, NULL,
+                             NULL, Item02Save, NULL,
+                             NULL, Item02Load, NULL);
     if (RT_FAILURE(rc))
     {
@@ -716 +726 @@
 
     rc = SSMR3RegisterDevice(pVM, NULL, "SSM Testcase Data Item no.3 (big mem)", 0, 123, 512*_1M, NULL,
-        NULL, Item03Save, NULL,
-        NULL, Item03Load, NULL);
+                             NULL, NULL, NULL,
+                             NULL, Item03Save, NULL,
+                             NULL, Item03Load, NULL);
     if (RT_FAILURE(rc))
     {
@@ -725 +736 @@
 
     rc = SSMR3RegisterDevice(pVM, NULL, "SSM Testcase Data Item no.4 (big zero mem)", 0, 42, 512*_1M, NULL,
-        NULL, Item04Save, NULL,
-        NULL, Item04Load, NULL);
+                             NULL, NULL, NULL,
+                             NULL, Item04Save, NULL,
+                             NULL, Item04Load, NULL);
     if (RT_FAILURE(rc))
     {
@@ -831 +843 @@
         return 1;
     }
-    uint32_t u32Version = 0xbadc0ded;
-    rc = SSMR3Seek(pSSM, "SSM Testcase Data Item no.2 (rand mem)", 2, &u32Version);
+    uint32_t uVersion = 0xbadc0ded;
+    rc = SSMR3Seek(pSSM, "SSM Testcase Data Item no.2 (rand mem)", 2, &uVersion);
     if (RT_FAILURE(rc))
     {
@@ -839 +851 @@
     }
     u64Start = RTTimeNanoTS();
-    rc = Item02Load(NULL, pSSM, u32Version);
+    rc = Item02Load(NULL, pSSM, uVersion, SSM_PHASE_FINAL);
     if (RT_FAILURE(rc))
     {
@@ -849 +861 @@
 
     /* 1st unit */
-    u32Version = 0xbadc0ded;
-    rc = SSMR3Seek(pSSM, "SSM Testcase Data Item no.1 (all types)", 1, &u32Version);
+    uVersion = 0xbadc0ded;
+    rc = SSMR3Seek(pSSM, "SSM Testcase Data Item no.1 (all types)", 1, &uVersion);
     if (RT_FAILURE(rc))
     {
@@ -857 +869 @@
     }
     u64Start = RTTimeNanoTS();
-    rc = Item01Load(NULL, pSSM, u32Version);
+    rc = Item01Load(NULL, pSSM, uVersion, SSM_PHASE_FINAL);
     if (RT_FAILURE(rc))
     {
@@ -867 +879 @@
 
     /* 3st unit */
-    u32Version = 0xbadc0ded;
-    rc = SSMR3Seek(pSSM, "SSM Testcase Data Item no.3 (big mem)", 0, &u32Version);
+    uVersion = 0xbadc0ded;
+    rc = SSMR3Seek(pSSM, "SSM Testcase Data Item no.3 (big mem)", 0, &uVersion);
     if (RT_FAILURE(rc))
     {
@@ -875 +887 @@
     }
     u64Start = RTTimeNanoTS();
-    rc = Item03Load(NULL, pSSM, u32Version);
+    rc = Item03Load(NULL, pSSM, uVersion, SSM_PHASE_FINAL);
     if (RT_FAILURE(rc))
     {