Changeset 1480 in vbox for trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (6 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -474 +474 @@
     In.u32Cookie        = g_u32Cookie;
     In.u32SessionCookie = g_u32SessionCookie;
-    In.pv               = pvStart;
+    In.pvR3             = pvStart;
     In.cb               = (uint32_t)cbMemory; AssertRelease(In.cb == cbMemory);
     int rc;
@@ -529 +529 @@
     In.u32Cookie        = g_u32Cookie;
     In.u32SessionCookie = g_u32SessionCookie;
-    In.pv               = pvStart;
+    In.pvR3             = pvStart;
     int rc;
     if (!g_u32FakeMode)
@@ -602 +602 @@
     In.u32Cookie        = g_u32Cookie;
     In.u32SessionCookie = g_u32SessionCookie;
-    In.pv               = pv;
+    In.pvR3             = pv;
     int rc;
     if (!g_u32FakeMode)
@@ -613 +613 @@
 
 
-SUPR3DECL(int) SUPLowAlloc(unsigned cPages, void **ppvPages, PSUPPAGE paPages)
+SUPR3DECL(int) SUPLowAlloc(unsigned cPages, void **ppvPages, PRTR0PTR ppvPagesR0, PSUPPAGE paPages)
 {
     /*
@@ -640 +640 @@
             if (VBOX_SUCCESS(rc))
             {
-                *ppvPages = pOut->pvVirt;
+                *ppvPages = pOut->pvR3;
+                if (ppvPagesR0)
+                    *ppvPagesR0 = pOut->pvR0;
                 AssertCompile(sizeof(paPages[0]) == sizeof(pOut->aPages[0]));
                 memcpy(paPages, &pOut->aPages[0], sizeof(paPages[0]) * cPages);
@@ -688 +690 @@
     In.u32Cookie        = g_u32Cookie;
     In.u32SessionCookie = g_u32SessionCookie;
-    In.pv               = pv;
+    In.pvR3             = pv;
     int rc;
     if (!g_u32FakeMode)