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

Timestamp:

Jul 28, 2008 11:10:18 AM (17 years ago)

Author:

vboxsync

Message:

tstSSM: Fixed bustage caused by the UVM change.

File:

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

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

@@ -26 +26 @@
 #include <VBox/ssm.h>
 #include <VBox/vm.h>
+#include <VBox/uvm.h>
+#include <VBox/mm.h>
+#include <VBox/stam.h>
 
 #include <VBox/log.h>
@@ -31 +34 @@
 #include <VBox/err.h>
 #include <VBox/param.h>
-#include <iprt/runtime.h>
 #include <iprt/assert.h>
+#include <iprt/initterm.h>
+#include <iprt/mem.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
@@ -554 +558 @@
 
 
+/**
+ * Creates a mockup VM structure for testing SSM.
+ *
+ * @returns 0 on success, 1 on failure.
+ * @param   ppVM    Where to store the VM handle.
+ */
+static int createFakeVM(PVM *ppVM)
+{
+    /*
+     * Allocate and init the UVM structure.
+     */
+    PUVM pUVM = (PUVM)RTMemAllocZ(sizeof(*pUVM));
+    AssertReturn(pUVM, 1);
+    pUVM->u32Magic = UVM_MAGIC;
+
+    int rc = STAMR3InitUVM(pUVM);
+    if (RT_SUCCESS(rc))
+    {
+        rc = MMR3InitUVM(pUVM);
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Allocate and init the VM structure.
+             */
+            PVM pVM;
+            rc = SUPPageAlloc((sizeof(*pVM) + PAGE_SIZE - 1) >> PAGE_SHIFT, (void **)&pVM);
+            if (RT_SUCCESS(rc))
+            {
+                pVM->enmVMState = VMSTATE_CREATED;
+                pVM->pVMR3 = pVM;
+                pVM->pUVM = pUVM;
+
+                pUVM->pVM = pVM;
+                *ppVM = pVM;
+                return 0;
+            }
+
+            RTPrintf("Fatal error: failed to allocated pages for the VM structure, rc=%Rrc\n", rc);
+        }
+        else
+            RTPrintf("Fatal error: MMR3InitUVM failed, rc=%Rrc\n", rc);
+    }
+    else
+        RTPrintf("Fatal error: SSMR3InitUVM failed, rc=%Rrc\n", rc);
+
+    *ppVM = NULL;
+    return 1;
+}
+
+
 int main(int argc, char **argv)
 {
@@ -565 +619 @@
 
     /*
-     * Create empty VM structure and init SSM.
-     */
-    PVM         pVM;
+     * Create an fake VM structure and init SSM.
+     */
     int rc = SUPInit(NULL);
-    if (VBOX_SUCCESS(rc))
-        rc = SUPPageAlloc((sizeof(*pVM) + PAGE_SIZE - 1) >> PAGE_SHIFT, (void **)&pVM);
     if (VBOX_FAILURE(rc))
     {
@@ -576 +627 @@
         return 1;
     }
-
-///@todo    rc = STAMR3Init(pVM);
-    if (VBOX_FAILURE(rc))
-    {
-        RTPrintf("Fatal error: STAMR3Init failed! rc=%Vrc\n", rc);
-        return 1;
-    }
-
-/*
-    rc = SSMR3Init(pVM);
-    if (VBOX_FAILURE(rc))
-    {
-        RTPrintf("Fatal error: SSMR3Init failed! rc=%Vrc\n", rc);
-        return 1;
-    }
-*/
+    PVM pVM;
+    if (createFakeVM(&pVM))
+        return 1;
 
     /*