From a1f26d85171b4d554225150053700e93ba6eba10 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 21 Jan 2014 10:46:52 +0100 Subject: use recommended max vcpu count RH-Author: Andrew Jones Message-id: <1390301212-15344-1-git-send-email-drjones@redhat.com> Patchwork-id: 56862 O-Subject: [RHEL7.0 qemu-kvm PATCH v6] use recommended max vcpu count Bugzilla: 998708 RH-Acked-by: Paolo Bonzini RH-Acked-by: Laszlo Ersek RH-Acked-by: Marcelo Tosatti The recommended vcpu max limit (KVM_CAP_NR_VCPUS) should be used instead of the actual max vcpu limit (KVM_CAP_MAX_VCPUS) to give an error. This matches the limit tested by QE on RHEL6: 160. Signed-off-by: Andrew Jones (cherry picked from commit a4ceb63bdc5cbac19f5f633ec761b9de0dedb55e) --- accel/kvm/kvm-all.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 46ce479..b42c56a 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -1627,6 +1627,9 @@ static int kvm_init(MachineState *ms) soft_vcpus_limit = kvm_recommended_vcpus(s); hard_vcpus_limit = kvm_max_vcpus(s); + /* RHEL doesn't support nr_vcpus > soft_vcpus_limit */ + hard_vcpus_limit = soft_vcpus_limit; + while (nc->name) { if (nc->num > soft_vcpus_limit) { fprintf(stderr, -- 1.8.3.1