From patchwork Wed Aug 1 09:01:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takuya Yoshikawa X-Patchwork-Id: 174404 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3711F2C00A3 for ; Wed, 1 Aug 2012 19:01:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752171Ab2HAJBj (ORCPT ); Wed, 1 Aug 2012 05:01:39 -0400 Received: from tama500.ecl.ntt.co.jp ([129.60.39.148]:63147 "EHLO tama500.ecl.ntt.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752063Ab2HAJBi (ORCPT ); Wed, 1 Aug 2012 05:01:38 -0400 Received: from mfs5.rdh.ecl.ntt.co.jp (mfs5.rdh.ecl.ntt.co.jp [129.60.39.144]) by tama500.ecl.ntt.co.jp (8.14.5/8.14.5) with ESMTP id q7191Tup018048; Wed, 1 Aug 2012 18:01:29 +0900 (JST) Received: from mfs5.rdh.ecl.ntt.co.jp (localhost.localdomain [127.0.0.1]) by mfs5.rdh.ecl.ntt.co.jp (Postfix) with ESMTP id ABE71E00DF; Wed, 1 Aug 2012 18:01:29 +0900 (JST) Received: from imail2.m.ecl.ntt.co.jp (imail2.m.ecl.ntt.co.jp [129.60.5.247]) by mfs5.rdh.ecl.ntt.co.jp (Postfix) with ESMTP id 95054E00DE; Wed, 1 Aug 2012 18:01:29 +0900 (JST) Received: from yshpad ([129.60.241.221]) by imail2.m.ecl.ntt.co.jp (8.13.8/8.13.8) with SMTP id q7191RQN008161; Wed, 1 Aug 2012 18:01:29 +0900 Date: Wed, 1 Aug 2012 18:01:10 +0900 From: Takuya Yoshikawa To: avi@redhat.com, mtosatti@redhat.com Cc: agraf@suse.de, paulus@samba.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Subject: [PATCH 1/3] KVM: Stop checking rmap to see if slot is being created Message-Id: <20120801180110.06f13bce.yoshikawa.takuya@oss.ntt.co.jp> In-Reply-To: <20120801175954.ea4c434b.yoshikawa.takuya@oss.ntt.co.jp> References: <20120801175954.ea4c434b.yoshikawa.takuya@oss.ntt.co.jp> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.24.4; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Instead, check npages consistently. This helps to make rmap architecture specific in a later patch. Signed-off-by: Takuya Yoshikawa --- arch/x86/kvm/x86.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index b6379e5..701dbd4 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6381,7 +6381,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, *x86 needs to handle !user_alloc case. */ if (!user_alloc) { - if (npages && !old.rmap) { + if (npages && !old.npages) { unsigned long userspace_addr; userspace_addr = vm_mmap(NULL, 0, @@ -6409,7 +6409,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, int nr_mmu_pages = 0, npages = mem->memory_size >> PAGE_SHIFT; - if (!user_alloc && !old.user_alloc && old.rmap && !npages) { + if (!user_alloc && !old.user_alloc && old.npages && !npages) { int ret; ret = vm_munmap(old.userspace_addr,