diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-06-14 16:26:50 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-06-14 16:26:50 -0400 |
| commit | ca699d88fdbba0b809f564d198323ab03d5b4fd5 (patch) | |
| tree | 8647bfcef73254a4ff84e708534e89f550b0f73f /virt | |
| parent | 5b4910e057b97b241219a42bc32bc1caa605f05a (diff) | |
| parent | 768292d053619b2725b846ed2bf556bf40f43de2 (diff) | |
Merge tag 'v4.19.50' into v4.19-rt
This is the 4.19.50 stable release
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arm.c | 3 | ||||
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 4ca808b6e026..d36802fe2825 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -223,6 +223,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_MAX_VCPU_ID: + r = KVM_MAX_VCPU_ID; + break; case KVM_CAP_NR_MEMSLOTS: r = KVM_USER_MEM_SLOTS; break; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index e909d9907b50..2b36a51afb57 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2965,8 +2965,6 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) case KVM_CAP_MULTI_ADDRESS_SPACE: return KVM_ADDRESS_SPACE_NUM; #endif - case KVM_CAP_MAX_VCPU_ID: - return KVM_MAX_VCPU_ID; default: break; } |