diff mbox

[v2,2/3] vl: fix max_cpus check

Message ID 1415731856-14121-3-git-send-email-ehabkost@redhat.com
State Accepted
Commit c00cd99527d0d1b47a387239a7e3a8cf8ff82764
Headers show

Commit Message

Eduardo Habkost Nov. 11, 2014, 6:50 p.m. UTC 
From: Andrew Jones <drjones@redhat.com>

We should confirm max_cpus, which is >= smp_cpus, is
<= the machine's true max_cpus, not just smp_cpus.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 vl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/vl.c b/vl.c
index c1bfc9b..2ed8b07 100644
--- a/vl.c
+++ b/vl.c
@@ -3901,9 +3901,9 @@  int main(int argc, char **argv, char **envp)
     smp_parse(qemu_opts_find(qemu_find_opts("smp-opts"), NULL));
 
     machine_class->max_cpus = machine_class->max_cpus ?: 1; /* Default to UP */
-    if (smp_cpus > machine_class->max_cpus) {
+    if (max_cpus > machine_class->max_cpus) {
         fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus "
-                "supported by machine `%s' (%d)\n", smp_cpus,
+                "supported by machine `%s' (%d)\n", max_cpus,
                 machine_class->name, machine_class->max_cpus);
         exit(1);
     }