From nobody@FreeBSD.org  Sat Jul 21 19:46:30 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2EA1410657C0
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] emulators/virtualbox-ose-kmod needs modification after VM KPI rename
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         170056
>Category:       ports
>Synopsis:       [patch] emulators/virtualbox-ose-kmod needs modification after VM KPI rename
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    vbox
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 21 19:50:05 UTC 2012
>Closed-Date:    Wed Jul 25 19:21:54 UTC 2012
>Last-Modified:  Sun Feb 03 22:30:42 UTC 2013
>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:

From: Garrett Cooper <yaneurabeya@gmail.com>
To: bug-followup@FreeBSD.org, yanegomi@gmail.com
Cc:  
Subject: Re: misc/170056: [patch] emulators/virtualbox-ose-kmod needs
 modification after VM KPI rename
Date: Sat, 21 Jul 2012 14:53:41 -0700

 There's some discussion about reverting the gratuitous name change by alc@.
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Jul 22 04:18:24 UTC 2012 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170056 
Responsible-Changed-From-To: freebsd-ports-bugs->vbox 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jul 22 04:18:50 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170056 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170056: commit references a PR
Date: Wed, 25 Jul 2012 19:12:51 +0000 (UTC)

 Author: decke
 Date: Wed Jul 25 19:12:39 2012
 New Revision: 301527
 URL: http://svn.freebsd.org/changeset/ports/301527
 
 Log:
   - Follow vm_contig_grow_cache() renaming to vm_pageout_grow_cache() in r238561
   
   PR:		ports/170056
   Submitted by:	Garrett Cooper <yaneurabeya@gmail.com>
   Thanks to:	alc, avg
 
 Modified:
   head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c   (contents, props changed)
 
 Modified: head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
 ==============================================================================
 --- head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Wed Jul 25 18:10:40 2012	(r301526)
 +++ head/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c	Wed Jul 25 19:12:39 2012	(r301527)
 @@ -1,5 +1,5 @@
 ---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2011-12-19 15:01:31.000000000 +0200
 -+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2012-02-23 01:24:32.111859551 +0200
 +--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2012-06-20 15:18:10.000000000 +0200
 ++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c	2012-07-25 18:04:01.534886951 +0200
  @@ -5,6 +5,7 @@
   
   /*
 @@ -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;
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: decke 
State-Changed-When: Wed Jul 25 19:21:53 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170056 
>Unformatted:
