From owner-svn-soc-all@freebsd.org Tue Jul 21 13:42:25 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B9069A526D for ; Tue, 21 Jul 2015 13:42:25 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0B851883 for ; Tue, 21 Jul 2015 13:42:24 +0000 (UTC) (envelope-from stefano@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6LDgOxX009401 for ; Tue, 21 Jul 2015 13:42:24 GMT (envelope-from stefano@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6LDgOVL009389 for svn-soc-all@FreeBSD.org; Tue, 21 Jul 2015 13:42:24 GMT (envelope-from stefano@FreeBSD.org) Date: Tue, 21 Jul 2015 13:42:24 GMT Message-Id: <201507211342.t6LDgOVL009389@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to stefano@FreeBSD.org using -f From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288611 - soc2015/stefano/ptnetmap/stable/10/sys/amd64/vmm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2015 13:42:25 -0000 Author: stefano Date: Tue Jul 21 13:42:23 2015 New Revision: 288611 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288611 Log: fix vmm_usermem_alloc() use the offset retuned by vm_map_lookup() into vm_map_find() Modified: soc2015/stefano/ptnetmap/stable/10/sys/amd64/vmm/vmm_usermem.c Modified: soc2015/stefano/ptnetmap/stable/10/sys/amd64/vmm/vmm_usermem.c ============================================================================== --- soc2015/stefano/ptnetmap/stable/10/sys/amd64/vmm/vmm_usermem.c Tue Jul 21 13:41:33 2015 (r288610) +++ soc2015/stefano/ptnetmap/stable/10/sys/amd64/vmm/vmm_usermem.c Tue Jul 21 13:42:23 2015 (r288611) @@ -131,7 +131,7 @@ printf("---- guest MAP vm_object_t: %p vm_pindex: %ld ----\n", obj, index); /* map th vm_object in the vmspace */ if (obj != NULL) { - error = vm_map_find(&vmspace->vm_map, obj, 0, &gpa, len, 0, + error = vm_map_find(&vmspace->vm_map, obj, index, &gpa, len, 0, VMFS_NO_SPACE, VM_PROT_RW, VM_PROT_RW, 0); if (error != KERN_SUCCESS) { vm_object_deallocate(obj);