From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: [RFC 4/5] KVM: ARM: Use KVM_VCPU_GET_REG_LIST. Date: Wed, 29 Aug 2012 09:17:53 +0930 Message-ID: <87sjb68tp2.fsf@rustcorp.com.au> References: <877gsia8rm.fsf@rustcorp.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvmarm@lists.cs.columbia.edu, kvm-devel To: Avi Kivity , Christoffer Dall , Alexander Graf , Peter Maydell Return-path: Received: from ozlabs.org ([203.10.76.45]:56619 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752827Ab2H1XtR (ORCPT ); Tue, 28 Aug 2012 19:49:17 -0400 In-Reply-To: <877gsia8rm.fsf@rustcorp.com.au> Sender: kvm-owner@vger.kernel.org List-ID: This trivially replaces the arm-specific KVM_VCPU_GET_MSR_INDEX_LIST. Signed-off-by: Rusty Russell diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 209b432..b607f60 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -906,6 +906,5 @@ struct kvm_s390_ucas_mapping { #define KVM_KVMCLOCK_CTRL _IO(KVMIO, 0xad) #define KVM_ARM_VCPU_INIT _IOW(KVMIO, 0xae, struct kvm_vcpu_init) -#define KVM_VCPU_GET_MSR_INDEX_LIST _IOWR(KVMIO, 0xaf, struct kvm_msr_list) #define KVM_VCPU_GET_REG_LIST _IOWR(KVMIO, 0xb0, struct kvm_reg_list) #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) diff --git a/arch/arm/include/asm/kvm.h b/arch/arm/include/asm/kvm.h index 9838456..a3daa67 100644 --- a/arch/arm/include/asm/kvm.h +++ b/arch/arm/include/asm/kvm.h @@ -85,12 +85,6 @@ struct kvm_sync_regs { struct kvm_arch_memory_slot { }; -/* for KVM_VCPU_GET_MSR_INDEX_LIST */ -struct kvm_msr_list { - __u64 nmsrs; /* number of msrs in entries */ - __u64 indices[0]; -}; - /* If you need to interpret the index values, here are the bit offsets. */ #define KVM_REG_ARM_COPROC_START 16 /* Mask: 0xFFFF0000 */ #define KVM_REG_ARM_32_OPC2_START 0 /* Mask: 0x00000007 */ diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 7548c95..64fa65f 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -26,6 +26,7 @@ #define KVM_PRIVATE_MEM_SLOTS 4 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 #define KVM_HAVE_ONE_REG +#define KVM_HAVE_REG_LIST #define NUM_FEATURES 0 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 55a2995..fe98b77 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -711,21 +711,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp, return kvm_vcpu_set_target(vcpu, &init); } - case KVM_VCPU_GET_MSR_INDEX_LIST: { - struct kvm_msr_list __user *user_msr_list = argp; - struct kvm_msr_list msr_list; - unsigned n; - - if (copy_from_user(&msr_list, user_msr_list, sizeof msr_list)) - return -EFAULT; - n = msr_list.nmsrs; - msr_list.nmsrs = kvm_arm_num_guest_msrs(vcpu); - if (copy_to_user(user_msr_list, &msr_list, sizeof msr_list)) - return -EFAULT; - if (n < msr_list.nmsrs) - return -E2BIG; - return kvm_arm_copy_msrindices(vcpu, user_msr_list->indices); - } default: return -EINVAL; } diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index 99de71b..0b9e8b4 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -877,21 +877,21 @@ static int walk_msrs(struct kvm_vcpu *vcpu, u64 __user *uind) } /** - * kvm_arm_num_guest_msrs - how many registers do we present via KVM_GET_MSR + * kvm_arch_num_regs - how many registers do we present via KVM_GET_ONE_REG * * This is for special registers, particularly cp15. */ -unsigned long kvm_arm_num_guest_msrs(struct kvm_vcpu *vcpu) +unsigned long kvm_arch_num_regs(struct kvm_vcpu *vcpu) { return ARRAY_SIZE(invariant_cp15) + walk_msrs(vcpu, (u64 __user *)NULL); } /** - * kvm_arm_copy_msrindices - copy a series of coprocessor registers. + * kvm_arch_copy_reg_indices - copy a series of coprocessor registers. * * This is for special registers, particularly cp15. */ -int kvm_arm_copy_msrindices(struct kvm_vcpu *vcpu, u64 __user *uindices) +int kvm_arch_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) { unsigned int i; int err;