Changeset 2014 in vbox for trunk/src

Timestamp:

Apr 10, 2007 3:56:23 PM (18 years ago)

Author:

vboxsync

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

20302

Message:

r=bird: some cleanup of the cPages change.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDRVIOC.h (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)
• linux/SUPLib-linux.cpp (modified) (4 diffs)
• testcase/tstContiguous.cpp (modified) (1 diff)
• testcase/tstPin.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDRVIOC.h

@@ -174 +174 @@
  * The upper 16-bit is the major version, the the lower the minor version.
  * When incompatible changes are made, the upper major number has to be changed. */
-#define SUPDRVIOC_VERSION           0x00050004
+#define SUPDRVIOC_VERSION           0x00050000
 
 /** SUP_IOCTL_COOKIE Input. */

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

@@ -197 +197 @@
         strcpy(In.szMagic, SUPCOOKIE_MAGIC);
         In.u32ReqVersion = SUPDRVIOC_VERSION;
-        if (SUPDRVIOC_VERSION < 0x00050000)
-            In.u32MinVersion = 0x00040004;
-        else
-            In.u32MinVersion = SUPDRVIOC_VERSION & 0xffff0000;
+        In.u32MinVersion = SUPDRVIOC_VERSION & 0xffff0000;
         rc = suplibOsIOCtl(SUP_IOCTL_COOKIE, &In, sizeof(In), &Out, sizeof(Out));
         if (VBOX_SUCCESS(rc))
         {
-            if (    (Out.u32SessionVersion & 0xffff0000) == (SUPDRVIOC_VERSION & 0xffff0000)
-                &&  Out.u32SessionVersion >= 0x00040004)
+            if ((Out.u32SessionVersion & 0xffff0000) == (SUPDRVIOC_VERSION & 0xffff0000))
             {
                 /*

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

@@ -51 +51 @@
 #define DEVICE_NAME     "/dev/vboxdrv"
 
+/* define MADV_DONTFORK if it's missing from the system headers. */
 #ifndef MADV_DONTFORK
-#define MADV_DONTFORK      10
+# define MADV_DONTFORK  10
 #endif
 
@@ -63 +64 @@
 /** Flags whether or not we've loaded the kernel module. */
 static bool     g_fLoadedModule = false;
-/** Checks */
+/** Indicates whether madvise(,,MADV_DONTFORK) works.  */
 static bool     g_fSysMadviseWorks = false;
 
@@ -127 +128 @@
 
     /*
-     * Check driver version.
-     */
-    /** @todo implement driver version checking. */
-
-    /*
      * Check if madvise works.
      */
@@ -266 +262 @@
 #else
     size_t cbMmap = (g_fSysMadviseWorks ? cPages : cPages + 2) << PAGE_SHIFT;
-    char *pvPages = (char*)mmap(NULL, cbMmap, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    char *pvPages = (char *)mmap(NULL, cbMmap, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
     if (pvPages)
     {

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

@@ -75 +75 @@
     }
 
-    /* useless since SUPContAlloc/SUPContFree use cPages now */
-#if 0
-    /*
-     * 2nd part
-     */
-    if (!rcRet)
-    {
-        rc = SUPInit();
-        RTPrintf("tstContiguous: SUPInit -> rc=%Vrc\n", rc);
-        rcRet += rc != 0;
-        if (!rc)
-        {
-            for (int i = 0; i < 256; i++)
-            {
-                RTHCPHYS HCPhys = 0;
-                void *pv = SUPContAlloc(PAGE_SIZE + 512 + i, &HCPhys);
-                rcRet += pv == NULL || HCPhys == 0;
-                if (pv && HCPhys)
-                {
-                    memset(pv, 0x7f, PAGE_SIZE + 512 + i);
-                    rc = SUPContFree(pv);
-                    rcRet += rc != 0;
-                    if (rc)
-                        RTPrintf("tstContiguous: %d: SUPContFree failed! rc=%Vrc\n", i, rc);
-                }
-                else
-                    RTPrintf("tstContiguous: %d: SUPContAlloc failed!\n", i);
-            }
-
-            rc = SUPTerm();
-            RTPrintf("tstContiguous: SUPTerm -> rc=%Vrc\n", rc);
-            rcRet += rc != 0;
-        }
-    }
-#endif
-
     return rcRet;
 }

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

@@ -54 +54 @@
         for (unsigned i = 0; i < sizeof(aPinnings) / sizeof(aPinnings[0]); i++)
         {
-#ifdef __OS2__
             aPinnings[i].pv = NULL;
             SUPPageAlloc(0x10000 >> PAGE_SHIFT, &aPinnings[i].pv);
-#else
-            aPinnings[i].pv = malloc(0x10000);
-#endif
             aPinnings[i].pvAligned = ALIGNP(aPinnings[i].pv, PAGE_SIZE);
             rc = SUPPageLock(aPinnings[i].pvAligned, 0xf000 >> PAGE_SHIFT, &aPinnings[i].aPages[0]);
@@ -79 +75 @@
                 RTPrintf("SUPPageLock -> rc=%d\n", rc);
                 rcRet++;
-#ifdef __OS2__
                 SUPPageFree(aPinnings[i].pv, 0x10000 >> PAGE_SHIFT);
-#else
-                free(aPinnings[i].pv);
-#endif
                 aPinnings[i].pv = aPinnings[i].pvAligned = NULL;
                 break;
@@ -108 +100 @@
             {
                 memset(aPinnings[i].pv, 0xcc, 0x10000);
-#ifdef __OS2__
                 SUPPageFree(aPinnings[i].pv, 0x10000 >> PAGE_SHIFT);
-#else
-                free(aPinnings[i].pv);
-#endif
                 aPinnings[i].pv = NULL;
             }
@@ -152 +140 @@
         #define BIG_SIZE    72*1024*1024
         #define BIG_SIZEPP  (BIG_SIZE + PAGE_SIZE)
-#ifdef __OS2__
         pv = NULL;
         SUPPageAlloc(BIG_SIZEPP >> PAGE_SHIFT, &pv);
-#else
-        pv = malloc(BIG_SIZEPP);
-#endif
         if (pv)
         {
@@ -187 +171 @@
                 rcRet++;
             }
-#ifdef __OS2__
             SUPPageFree(pv, BIG_SIZEPP >> PAGE_SHIFT);
-#else
-            free(pv);
-#endif
         }