From owner-svn-ports-all@FreeBSD.ORG Thu Mar 21 02:29:18 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A95F4154; Thu, 21 Mar 2013 02:29:18 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9A75718A; Thu, 21 Mar 2013 02:29:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L2TIqK083156; Thu, 21 Mar 2013 02:29:18 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L2THNQ083153; Thu, 21 Mar 2013 02:29:17 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201303210229.r2L2THNQ083153@svn.freebsd.org> From: Sean Bruno Date: Thu, 21 Mar 2013 02:29:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314796 - in head/emulators/virtualbox-ose-kmod: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Mar 2013 02:29:18 -0000 Author: sbruno (src committer) Date: Thu Mar 21 02:29:17 2013 New Revision: 314796 URL: http://svnweb.freebsd.org/changeset/ports/314796 Log: Add wrapper FreeBSD_Version check at the break point for VM_OBJECT_RLOCK name change so we still build on stable branches. Suggested by: bdrewery Modified: head/emulators/virtualbox-ose-kmod/Makefile head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h Modified: head/emulators/virtualbox-ose-kmod/Makefile ============================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile Thu Mar 21 01:59:22 2013 (r314795) +++ head/emulators/virtualbox-ose-kmod/Makefile Thu Mar 21 02:29:17 2013 (r314796) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators kld MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c ============================================================================== --- head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c Thu Mar 21 01:59:22 2013 (r314795) +++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd_VM_OBJECT_RENAME.c Thu Mar 21 02:29:17 2013 (r314796) @@ -1,95 +1,132 @@ $FreeBSD$ ---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2013-03-20 14:45:46.594643103 -0700 -+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2013-03-20 14:33:00.483697105 -0700 -@@ -162,7 +162,7 @@ +--- /home/sbruno/ports/virtualbox-ose-kmod/work/VirtualBox-4.2.6/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2013-03-20 19:19:36.795745576 -0700 ++++ ../work/VirtualBox-4.2.6/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2013-03-20 19:15:35.164791970 -0700 +@@ -162,7 +162,11 @@ case RTR0MEMOBJTYPE_PHYS: case RTR0MEMOBJTYPE_PHYS_NC: { -- VM_OBJECT_LOCK(pMemFreeBSD->pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RLOCK(pMemFreeBSD->pObject); ++#else + VM_OBJECT_LOCK(pMemFreeBSD->pObject); ++#endif vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0); #if __FreeBSD_version < 900000 /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */ -@@ -177,7 +177,7 @@ +@@ -177,7 +181,12 @@ #if __FreeBSD_version < 900000 vm_page_unlock_queues(); #endif -- VM_OBJECT_UNLOCK(pMemFreeBSD->pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RUNLOCK(pMemFreeBSD->pObject); ++#else + VM_OBJECT_UNLOCK(pMemFreeBSD->pObject); ++#endif ++ vm_object_deallocate(pMemFreeBSD->pObject); break; } -@@ -205,10 +205,10 @@ +@@ -205,10 +214,18 @@ while (cTries <= 1) { -- VM_OBJECT_LOCK(pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RLOCK(pObject); ++#else + VM_OBJECT_LOCK(pObject); ++#endif pPages = vm_page_alloc_contig(pObject, iPIndex, fFlags, cPages, 0, VmPhysAddrHigh, uAlignment, 0, VM_MEMATTR_DEFAULT); -- VM_OBJECT_UNLOCK(pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RUNLOCK(pObject); ++#else + VM_OBJECT_UNLOCK(pObject); ++#endif if (pPages) break; vm_pageout_grow_cache(cTries, 0, VmPhysAddrHigh); -@@ -228,7 +228,7 @@ +@@ -228,7 +245,11 @@ if (!pPages) return pPages; -- VM_OBJECT_LOCK(pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RLOCK(pObject); ++#else + VM_OBJECT_LOCK(pObject); ++#endif for (vm_pindex_t iPage = 0; iPage < cPages; iPage++) { vm_page_t pPage = pPages + iPage; -@@ -240,7 +240,7 @@ +@@ -240,7 +261,11 @@ atomic_add_int(&cnt.v_wire_count, 1); } } -- VM_OBJECT_UNLOCK(pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RUNLOCK(pObject); ++#else + VM_OBJECT_UNLOCK(pObject); ++#endif return pPages; #endif } -@@ -264,7 +264,7 @@ +@@ -264,7 +289,11 @@ if (!pPage) { /* Free all allocated pages */ -- VM_OBJECT_LOCK(pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RLOCK(pObject); ++#else + VM_OBJECT_LOCK(pObject); ++#endif while (iPage-- > 0) { pPage = vm_page_lookup(pObject, iPage); -@@ -278,7 +278,7 @@ +@@ -278,7 +307,11 @@ vm_page_unlock_queues(); #endif } -- VM_OBJECT_UNLOCK(pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RUNLOCK(pObject); ++#else + VM_OBJECT_UNLOCK(pObject); ++#endif return rcNoMem; } } -@@ -411,9 +411,9 @@ +@@ -411,9 +444,17 @@ if (fContiguous) { Assert(enmType == RTR0MEMOBJTYPE_PHYS); -- VM_OBJECT_LOCK(pMemFreeBSD->pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RLOCK(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)); -- VM_OBJECT_UNLOCK(pMemFreeBSD->pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RUNLOCK(pMemFreeBSD->pObject); ++#else + VM_OBJECT_UNLOCK(pMemFreeBSD->pObject); ++#endif pMemFreeBSD->Core.u.Phys.fAllocated = true; } -@@ -823,9 +823,9 @@ +@@ -823,9 +864,17 @@ case RTR0MEMOBJTYPE_PHYS_NC: { RTHCPHYS addr; -- VM_OBJECT_LOCK(pMemFreeBSD->pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RLOCK(pMemFreeBSD->pObject); ++#else + VM_OBJECT_LOCK(pMemFreeBSD->pObject); ++#endif addr = VM_PAGE_TO_PHYS(vm_page_lookup(pMemFreeBSD->pObject, iPage)); -- VM_OBJECT_UNLOCK(pMemFreeBSD->pObject); ++#if __FreeBSD_version >= 1000030 + VM_OBJECT_RUNLOCK(pMemFreeBSD->pObject); ++#else + VM_OBJECT_UNLOCK(pMemFreeBSD->pObject); ++#endif return addr; } Modified: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h ============================================================================== --- head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h Thu Mar 21 01:59:22 2013 (r314795) +++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h Thu Mar 21 02:29:17 2013 (r314796) @@ -1,12 +1,14 @@ $FreeBSD$ ---- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2012-12-19 10:27:29.000000000 -0800 -+++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2013-03-20 14:50:35.330638254 -0700 -@@ -50,6 +50,7 @@ +--- /home/sbruno/ports/virtualbox-ose-kmod/work/VirtualBox-4.2.6/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2012-12-19 10:27:29.000000000 -0800 ++++ ../work/VirtualBox-4.2.6/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2013-03-20 19:10:15.854804053 -0700 +@@ -50,6 +50,9 @@ #include #include #include ++#if __FreeBSD_version >= 1000030 +#include ++#endif #include #include #include