summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinu Cherian <linu.cherian@cavium.com>2017-03-08 11:38:33 +0530
committerMarc Zyngier <marc.zyngier@arm.com>2017-03-09 09:13:39 +0000
commit7af4df85796589e60a2dfc0f821eca0c4bbce4d2 (patch)
treee01df4267f3ab7b22c42f1ef2e1df9b5bb30c5a5 /arch
parenta677e7046ab5edb33d051bda60cb3be0d60a48cc (diff)
downloadlinux-7af4df85796589e60a2dfc0f821eca0c4bbce4d2.tar.gz
linux-7af4df85796589e60a2dfc0f821eca0c4bbce4d2.tar.bz2
linux-7af4df85796589e60a2dfc0f821eca0c4bbce4d2.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kvm/arm.c3
1 files changed, 3 insertions, 0 deletions
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;