Changeset 77129 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2019 4:33:23 PM (6 years ago)

Author:

vboxsync

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

128587

Message:

the-freebsd-kernel.h,memobj-r0drv-freebsd.cpp: Some cleanup to reduce the amount of #if ... #else ... #endif

Location:

trunk/src/VBox/Runtime/r0drv/freebsd

Files:

• memobj-r0drv-freebsd.c (modified) (9 diffs)
• the-freebsd-kernel.h (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c

@@ -188 +188 @@
         case RTR0MEMOBJTYPE_PHYS_NC:
         {
-#if __FreeBSD_version >= 1000030
             VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-#else
-            VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-#endif
             vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0);
 #if __FreeBSD_version < 1000000
@@ -206 +202 @@
             vm_page_unlock_queues();
 #endif
-#if __FreeBSD_version >= 1000030
             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-#else
-            VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-#endif
             vm_object_deallocate(pMemFreeBSD->pObject);
             break;
@@ -238 +230 @@
     while (cTries <= 1)
     {
-#if __FreeBSD_version >= 1000030
         VM_OBJECT_WLOCK(pObject);
-#else
-        VM_OBJECT_LOCK(pObject);
-#endif
         pPages = vm_page_alloc_contig(pObject, iPIndex, fFlags, cPages, 0,
                                       VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT);
-#if __FreeBSD_version >= 1000030
         VM_OBJECT_WUNLOCK(pObject);
-#else
-        VM_OBJECT_UNLOCK(pObject);
-#endif
         if (pPages)
             break;
@@ -269 +253 @@
     if (!pPages)
         return pPages;
-#if __FreeBSD_version >= 1000030
     VM_OBJECT_WLOCK(pObject);
-#else
-    VM_OBJECT_LOCK(pObject);
-#endif
     for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
     {
@@ -285 +265 @@
         }
     }
-#if __FreeBSD_version >= 1000030
     VM_OBJECT_WUNLOCK(pObject);
-#else
-    VM_OBJECT_UNLOCK(pObject);
-#endif
     return pPages;
 #endif
@@ -313 +289 @@
         {
             /* Free all allocated pages */
-#if __FreeBSD_version >= 1000030
             VM_OBJECT_WLOCK(pObject);
-#else
-            VM_OBJECT_LOCK(pObject);
-#endif
             while (iPage-- > 0)
             {
@@ -331 +303 @@
 #endif
             }
-#if __FreeBSD_version >= 1000030
             VM_OBJECT_WUNLOCK(pObject);
-#else
-            VM_OBJECT_UNLOCK(pObject);
-#endif
             return rcNoMem;
         }
@@ -474 +442 @@
         {
             Assert(enmType == RTR0MEMOBJTYPE_PHYS);
-#if __FreeBSD_version >= 1000030
             VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-#else
-            VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-#endif
             pMemFreeBSD->Core.u.Phys.PhysBase = VM_PAGE_TO_PHYS(vm_page_find_least(pMemFreeBSD->pObject, 0));
-#if __FreeBSD_version >= 1000030
             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-#else
-            VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-#endif
             pMemFreeBSD->Core.u.Phys.fAllocated = true;
         }
@@ -903 +863 @@
         {
             RTHCPHYS addr;
-#if __FreeBSD_version >= 1000030
+
             VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
-#else
-            VM_OBJECT_LOCK(pMemFreeBSD->pObject);
-#endif
             addr = VM_PAGE_TO_PHYS(vm_page_lookup(pMemFreeBSD->pObject, iPage));
-#if __FreeBSD_version >= 1000030
             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
-#else
-            VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
-#endif
             return addr;
         }

trunk/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h

@@ -130 +130 @@
 
 /**
+ * The VM object lock/unlock wrappers for older kernels.
+ */
+#if __FreeBSD_version < 1000030
+# define VM_OBJECT_WLOCK(a_pObject) VM_OBJECT_LOCK((a_pObject))
+# define VM_OBJECT_WUNLOCK(a_pObject) VM_OBJECT_UNLOCK((a_pObject))
+#endif
+
+/**
  * Check whether we can use kmem_alloc_attr for low allocs.
  */