KVM: RISC-V: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
authorVitaly Kuznetsov <vkuznets@redhat.com>
Tue, 16 Nov 2021 16:34:41 +0000 (17:34 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 18 Nov 2021 07:12:14 +0000 (02:12 -0500)
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>
Acked-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
Message-Id: <20211116163443.88707-5-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/riscv/kvm/vm.c

index 26399df15b63418aaeb2529fd65145c4dec92a47..fb18af34a4b52f1275763a829324bca84a358bbc 100644 (file)
@@ -74,7 +74,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
                r = 1;
                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;