aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2013-08-12 16:56:31 -0300
committerPaolo Bonzini <pbonzini@redhat.com>2013-08-20 18:38:35 +0200
commit7dc52526850849e8e0fe56ced809d0798481a2f6 (patch)
tree5d385020e7c2eebd798b22299f7c9476f4a519c4
parent354678c5ce162649906e4e1be2859f3df372668f (diff)
kvm-all.c: max_cpus should not exceed KVM vcpu limit
maxcpus, which specifies the maximum number of hotpluggable CPUs, should not exceed KVM's vcpu limit. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> [Reword message. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--kvm-all.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kvm-all.c b/kvm-all.c
index ef52a0f966..a2d4978636 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1400,6 +1400,13 @@ int kvm_init(void)
goto err;
}
+ if (max_cpus > max_vcpus) {
+ ret = -EINVAL;
+ fprintf(stderr, "Number of hotpluggable cpus requested (%d) exceeds max cpus "
+ "supported by KVM (%d)\n", max_cpus, max_vcpus);
+ goto err;
+ }
+
s->vmfd = kvm_ioctl(s, KVM_CREATE_VM, 0);
if (s->vmfd < 0) {
#ifdef TARGET_S390X