aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-03-28 12:24:03 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2019-04-16 09:39:08 -0400
commitc110ae578ca0a10064dfbda3d786d6a733b9fe69 (patch)
treeb3c672dffd74fadaf513a2151bc839773b07a470 /virt/kvm
parent0a62956312e9dcd0ce5c59be4f0a8d8292a62402 (diff)
kvm: move KVM_CAP_NR_MEMSLOTS to common code
All architectures except MIPS were defining it in the same way, and memory slots are handled entirely by common code so there is no point in keeping the definition per-architecture. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/arm/arm.c3
-rw-r--r--virt/kvm/kvm_main.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 99c37384ba7b..be4ec5f3ba5f 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -224,9 +224,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
224 case KVM_CAP_MAX_VCPUS: 224 case KVM_CAP_MAX_VCPUS:
225 r = KVM_MAX_VCPUS; 225 r = KVM_MAX_VCPUS;
226 break; 226 break;
227 case KVM_CAP_NR_MEMSLOTS:
228 r = KVM_USER_MEM_SLOTS;
229 break;
230 case KVM_CAP_MSI_DEVID: 227 case KVM_CAP_MSI_DEVID:
231 if (!kvm) 228 if (!kvm)
232 r = -EINVAL; 229 r = -EINVAL;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index dc8edc97ba85..684b67252cd5 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3063,6 +3063,8 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
3063#endif 3063#endif
3064 case KVM_CAP_MAX_VCPU_ID: 3064 case KVM_CAP_MAX_VCPU_ID:
3065 return KVM_MAX_VCPU_ID; 3065 return KVM_MAX_VCPU_ID;
3066 case KVM_CAP_NR_MEMSLOTS:
3067 return KVM_USER_MEM_SLOTS;
3066 default: 3068 default:
3067 break; 3069 break;
3068 } 3070 }