From patchwork Fri Mar 15 02:09:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanjay Lal X-Patchwork-Id: 2274631 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1380FDFB79 for ; Fri, 15 Mar 2013 02:09:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753429Ab3COCJU (ORCPT ); Thu, 14 Mar 2013 22:09:20 -0400 Received: from kymasys.com ([64.62.140.43]:50863 "HELO kymasys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753334Ab3COCJT (ORCPT ); Thu, 14 Mar 2013 22:09:19 -0400 Received: from agni.kymasys.com ([75.40.23.192]) by kymasys.com for ; Thu, 14 Mar 2013 19:09:18 -0700 Received: by agni.kymasys.com (Postfix, from userid 500) id 0B5526300A6; Thu, 14 Mar 2013 19:09:18 -0700 (PDT) From: Sanjay Lal To: kvm@vger.kernel.org Cc: linux-mips@linux-mips.org, Gleb Natapov , Marcelo Tosatti , Ralf Baechle , Sanjay Lal Subject: [PATCH] KVM/MIPS32: Sync up with latest KVM API changes Date: Thu, 14 Mar 2013 19:09:16 -0700 Message-Id: <1363313356-32435-1-git-send-email-sanjayl@kymasys.com> X-Mailer: git-send-email 1.7.11.3 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org - Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS - Fix kvm_arch_{prepare,commit}_memory_region() - Also remove kvm_arch_set_memory_region which was unused. Signed-off-by: Sanjay Lal --- arch/mips/include/asm/kvm_host.h | 2 +- arch/mips/kvm/kvm_mips.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h index c8cddd1..143875c 100644 --- a/arch/mips/include/asm/kvm_host.h +++ b/arch/mips/include/asm/kvm_host.h @@ -21,7 +21,7 @@ #define KVM_MAX_VCPUS 1 -#define KVM_MEMORY_SLOTS 8 +#define KVM_USER_MEM_SLOTS 8 /* memory slots that does not exposed to userspace */ #define KVM_PRIVATE_MEM_SLOTS 0 diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c index 15ee558..2e60b1c 100644 --- a/arch/mips/kvm/kvm_mips.c +++ b/arch/mips/kvm/kvm_mips.c @@ -198,14 +198,6 @@ kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) return -EINVAL; } -int -kvm_arch_set_memory_region(struct kvm *kvm, - struct kvm_userspace_memory_region *mem, - struct kvm_memory_slot old, int user_alloc) -{ - return 0; -} - void kvm_arch_free_memslot(struct kvm_memory_slot *free, struct kvm_memory_slot *dont) { @@ -220,14 +212,14 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, struct kvm_memory_slot *memslot, struct kvm_memory_slot old, struct kvm_userspace_memory_region *mem, - int user_alloc) + bool user_alloc) { return 0; } void kvm_arch_commit_memory_region(struct kvm *kvm, struct kvm_userspace_memory_region *mem, - struct kvm_memory_slot old, int user_alloc) + struct kvm_memory_slot old, bool user_alloc) { unsigned long npages = 0; int i, err = 0;