aboutsummaryrefslogtreecommitdiff
path: root/kvm-all.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-11 19:39:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-11 19:39:17 +0000
commit239618707637ec87eba8c452d2b2f75dc5ca20c7 (patch)
tree857da2ab713933e6c797d355726bae54c636e748 /kvm-all.c
parent01207d0b78208c2f49c3f457d6794eea215d5be7 (diff)
parentb0f15a5d5628994c71a6f428f360a5a537ad3b39 (diff)
Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
* remotes/kvm/uq/master: target-i386: bugfix of Intel MPX file_ram_alloc: unify mem-path,mem-prealloc error handling kvm-all: exit in case max vcpus exceeded Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
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 87fe4821a6..82a91199e1 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1423,11 +1423,10 @@ int kvm_init(QEMUMachine *machine)
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++;