summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2014-02-25 23:22:07 -0300
committerPaolo Bonzini <pbonzini@redhat.com>2014-02-27 19:30:51 +0100
commit9ba3cf540fb902cbb40f0689868d51a2ac111852 (patch)
tree0a44a2d29b795ab2f15db672a690a3774a3b952f
parent9fbee91a131a05e443d7108d7fbdf3ca91020290 (diff)
downloadfocaccia-qemu-9ba3cf540fb902cbb40f0689868d51a2ac111852.tar.gz
focaccia-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>
-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++;