Changeset 1480 in vbox for trunk/src/VBox/HostDrivers/Support/testcase

Timestamp:

Mar 14, 2007 6:27:47 PM (18 years ago)

Author:

vboxsync

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

19541

Message:

No longer require contiguous memory for the VM structure.
Did long overdue IOCtl cleanup wrt R3/R0 pointers.

Location:

trunk/src/VBox/HostDrivers/Support/testcase

Files:

• tstInt.cpp (modified) (1 diff)
• tstLow.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp

@@ -87 +87 @@
              * Create a fake 'VM'.
              */
-            PVMR0 pVMR0;
-            RTHCPHYS HCPhysVM;
-            PVM pVM = (PVM)SUPContAlloc2(sizeof(*pVM), &pVMR0, &HCPhysVM);
-            if (pVM)
+            PVMR0 pVMR0 = NIL_RTR0PTR;
+            PVM pVM = NULL;
+            const unsigned cPages = RT_ALIGN_Z(sizeof(*pVM), PAGE_SIZE) >> PAGE_SHIFT;
+            PSUPPAGE paPages = (PSUPPAGE)RTMemAllocZ(cPages * sizeof(SUPPAGE));
+            if (paPages)
+                rc = SUPLowAlloc(cPages, (void **)&pVM, &pVMR0, &paPages[0]);
+            else
+                rc = VERR_NO_MEMORY;
+            if (VBOX_SUCCESS(rc))
             {
                 pVM->pVMGC = 0;
                 pVM->pVMR3 = pVM;
                 pVM->pVMR0 = pVMR0;
+#ifdef VBOX_USE_LOW_MEM_FOR_VM
+                pVM->paVMPagesR3 = paPages;
+#else
                 pVM->HCPhysVM = HCPhysVM;
+#endif 
                 pVM->pSession = pSession;
 

trunk/src/VBox/HostDrivers/Support/testcase/tstLow.cpp

@@ -50 +50 @@
         void *pvPages0 = (void *)0x77777777;
         memset(&aPages0[0], 0x8f, sizeof(aPages0));
-        rc = SUPLowAlloc(ELEMENTS(aPages0), &pvPages0, aPages0);
+        rc = SUPLowAlloc(ELEMENTS(aPages0), &pvPages0, NULL, aPages0);
         if (VBOX_SUCCESS(rc))
         {
@@ -98 +98 @@
             void *pvPages1 = (void *)0x77777777;
             memset(&aPages1[0], 0x8f, sizeof(aPages1));
-            rc = SUPLowAlloc(cPages, &pvPages1, aPages1);
+            rc = SUPLowAlloc(cPages, &pvPages1, NULL, aPages1);
             if (VBOX_SUCCESS(rc))
             {