From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [patch 05/18] kvm: nopage Date: Wed, 05 Dec 2007 12:40:17 +0200 Message-ID: <47568011.1080409@qumranet.com> References: <20071205071547.701344000@nick.local0.net> <20071205071627.251516000@nick.local0.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: npiggin-l3A5Bk7waGM@public.gmane.org Return-path: In-Reply-To: <20071205071627.251516000-wDNK3PsPySm71z1jCTBXHQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org npiggin-l3A5Bk7waGM@public.gmane.org wrote: > Convert KVM from nopage to fault. > > > @@ -3111,27 +3105,21 @@ out: > return r; > } > > -static struct page *kvm_vm_nopage(struct vm_area_struct *vma, > - unsigned long address, > - int *type) > +static int kvm_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) > { > struct kvm *kvm = vma->vm_file->private_data; > - unsigned long pgoff; > struct page *page; > > - pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; > - page = gfn_to_page(kvm, pgoff); > + page = gfn_to_page(kvm, vmf->pgoff); > if (!page) > - return NOPAGE_SIGBUS; > + return VM_FAULT_SIGBUS; > get_page(page); > - if (type != NULL) > - *type = VM_FAULT_MINOR; > - > - return page; > + vmf->page = page; > + return 0; > } > > This part has changed in kvm.git, so this won't apply to -mm. I ported it and applied to my tree, so it should arrive in -mm when Andrew re-fetches. -- error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4