diff options
| author |   Vitaly Kuznetsov <vkuznets@redhat.com> | 2021-11-16 17:34:43 +0100 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2021-11-18 02:12:15 -0500 |
| commit | 2845e7353bc334d43309f5ea6d376c8fdbc94c93 (patch) | |
| tree | c3ca3af4591ae4c6a701bdc15b103dfb1f9f4e11 | |
| parent | KVM: s390: Cap KVM_CAP_NR_VCPUS by num_online_cpus() (diff) | |
| download | linux-dev-2845e7353bc334d43309f5ea6d376c8fdbc94c93.tar.xz linux-dev-2845e7353bc334d43309f5ea6d376c8fdbc94c93.zip | |
KVM: x86: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
It doesn't make sense to return the recommended maximum number of
vCPUs which exceeds the maximum possible number of vCPUs.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20211116163443.88707-7-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ecd2041570d1..5a403d92833f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4179,7 +4179,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = !static_call(kvm_x86_cpu_has_accelerated_tpr)(); break; case KVM_CAP_NR_VCPUS: - r = num_online_cpus(); + r = min_t(unsigned int, num_online_cpus(), KVM_MAX_VCPUS); break; case KVM_CAP_MAX_VCPUS: r = KVM_MAX_VCPUS; |