From: Linu Cherian <linu.cherian@cavium.com>
Date: Wed, 8 Mar 2017 06:08:33 +0000 (+0530)
Subject: KVM: arm/arm64: Enable KVM_CAP_NR_MEMSLOTS on arm/arm64
X-Git-Tag: v4.11-rc2~4^2^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7af4df85796589e60a2dfc0f821eca0c4bbce4d2;p=platform%2Fkernel%2Flinux-exynos.git

KVM: arm/arm64: Enable KVM_CAP_NR_MEMSLOTS on arm/arm64

Return KVM_USER_MEM_SLOTS for userspace capability query on
NR_MEMSLOTS.

Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Linu Cherian <linu.cherian@cavium.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index c9a2103faeb9..96dba7cd8be7 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -221,6 +221,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	case KVM_CAP_MAX_VCPUS:
 		r = KVM_MAX_VCPUS;
 		break;
+	case KVM_CAP_NR_MEMSLOTS:
+		r = KVM_USER_MEM_SLOTS;
+		break;
 	case KVM_CAP_MSI_DEVID:
 		if (!kvm)
 			r = -EINVAL;