summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorNick Wang <jfwang@us.ibm.com>2013-03-25 17:22:58 +0100
committerGleb Natapov <gleb@redhat.com>2013-04-02 16:14:53 +0300
commite1e2e605c2ad6791ce6346b22443ce611709fa65 (patch)
tree2f4fb3c0a3d29b1f614f0231d38875315bf9fa72 /arch
parentdd2887e7c36d0be986ef17a9dbec904e3e334566 (diff)
downloadlinux-3.10-e1e2e605c2ad6791ce6346b22443ce611709fa65.tar.gz
linux-3.10-e1e2e605c2ad6791ce6346b22443ce611709fa65.tar.bz2
linux-3.10-e1e2e605c2ad6791ce6346b22443ce611709fa65.zip
KVM: s390: Enable KVM_CAP_NR_MEMSLOTS on s390
Return KVM_USER_MEM_SLOTS in kvm_dev_ioctl_check_extension(). Signed-off-by: Nick Wang <jfwang@us.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Gleb Natapov <gleb@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kvm/kvm-s390.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index b322ff15751..c1c7c683fa2 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -149,6 +149,9 @@ int kvm_dev_ioctl_check_extension(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_S390_COW:
r = MACHINE_HAS_ESOP;
break;