From owner-freebsd-bugs@FreeBSD.ORG Sat Jul 21 19:50:06 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 197F7106566C for ; Sat, 21 Jul 2012 19:50:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DDDA28FC14 for ; Sat, 21 Jul 2012 19:50:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6LJo5Cb031640 for ; Sat, 21 Jul 2012 19:50:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6LJo5fv031639; Sat, 21 Jul 2012 19:50:05 GMT (envelope-from gnats) Resent-Date: Sat, 21 Jul 2012 19:50:05 GMT Resent-Message-Id: <201207211950.q6LJo5fv031639@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Garrett Cooper Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EA1410657C0 for ; Sat, 21 Jul 2012 19:46:30 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 179638FC0A for ; Sat, 21 Jul 2012 19:46:30 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6LJkTM0070894 for ; Sat, 21 Jul 2012 19:46:29 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q6LJkT0T070862; Sat, 21 Jul 2012 19:46:29 GMT (envelope-from nobody) Message-Id: <201207211946.q6LJkT0T070862@red.freebsd.org> Date: Sat, 21 Jul 2012 19:46:29 GMT From: Garrett Cooper To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/170056: [patch] emulators/virtualbox-ose-kmod needs modification after VM KPI rename X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jul 2012 19:50:06 -0000 >Number: 170056 >Category: misc >Synopsis: [patch] emulators/virtualbox-ose-kmod needs modification after VM KPI rename >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Jul 21 19:50:05 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Garrett Cooper >Release: n/a >Organization: n/a >Environment: n/a >Description: vm_contig_grow_cache was renamed to vm_pageout_grow_cache in r238561, and this broke virtual box-ose-kmod loading on CURRENT: The attached patch is a simple string replace (I avoided the __FreeBSD_version #if because the KPI is a 10-CURRENT only KPI). 1. http://docs.freebsd.org/cgi/getmsg.cgi?fetch=366211+0+current/freebsd-current 2. http://docs.freebsd.org/cgi/getmsg.cgi?fetch=483944+0+current/freebsd-current >How-To-Repeat: >Fix: Patch attached with submission follows: Index: emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c =================================================================== --- emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c (revision 301281) +++ emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c (working copy) @@ -149,7 +149,7 @@ + VM_OBJECT_UNLOCK(pObject); + if (pPages || tries >= 1) + break; -+ vm_contig_grow_cache(tries, 0, VmPhysAddrHigh); ++ vm_pageout_grow_cache(tries, 0, VmPhysAddrHigh); + tries++; + } + return pPages; @@ -176,7 +176,7 @@ + pPages = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0); + if (pPages || tries >= 1) + break; -+ vm_contig_grow_cache(tries, 0, VmPhysAddrHigh); ++ vm_pageout_grow_cache(tries, 0, VmPhysAddrHigh); + tries++; + } + if (!pPages) >Release-Note: >Audit-Trail: >Unformatted: