summaryrefslogtreecommitdiffstats
path: root/kvm-all.c
diff options
context:
space:
mode:
authorMarcelo Tosatti2014-02-26 03:22:07 +0100
committerPaolo Bonzini2014-02-27 19:30:51 +0100
commit9ba3cf540fb902cbb40f0689868d51a2ac111852 (patch)
tree0a44a2d29b795ab2f15db672a690a3774a3b952f /kvm-all.c
parentMerge remote-tracking branch 'remotes/kvm/uq/master' into staging (diff)
downloadqemu-9ba3cf540fb902cbb40f0689868d51a2ac111852.tar.gz
qemu-9ba3cf540fb902cbb40f0689868d51a2ac111852.tar.xz
qemu-9ba3cf540fb902cbb40f0689868d51a2ac111852.zip
kvm-all: exit in case max vcpus exceeded
Rather than fall back to TCG (so the user has to discover whats happening, in case of no access to qemu stdout/stderr). Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kvm-all.c b/kvm-all.c
index fd8157ad5e..f299532e27 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1420,11 +1420,10 @@ int kvm_init(void)
nc->name, nc->num, soft_vcpus_limit);
if (nc->num > hard_vcpus_limit) {
- ret = -EINVAL;
fprintf(stderr, "Number of %s cpus requested (%d) exceeds "
"the maximum cpus supported by KVM (%d)\n",
nc->name, nc->num, hard_vcpus_limit);
- goto err;
+ exit(1);
}
}
nc++;