commit 3d878caab914d6ac7b3b69e458971b7550ea790b
author balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Tue Oct 28 10:59:59 2008 +0000
committer balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Tue Oct 28 10:59:59 2008 +0000
tree c5f52cbc4b19e76d0a05e29efd4ff7309f9feaa8
parent d4354694e9813be1cb0b26ad1706701ea9b524ce

Set default max_cpus to one.

Clean-up machine definitions.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5566 c046a42c-6fe2-441c-8c8c-71466251a162

vl.c

diff --git a/vl.c b/vl.c
index 0ca7151..1afe36e 100644
--- a/vl.c
+++ b/vl.c
@@ -9407,6 +9407,7 @@
         }
     }
 
+    machine->max_cpus = machine->max_cpus ?: 1; /* Default to UP */
     if (smp_cpus > machine->max_cpus) {
         fprintf(stderr, "Number of SMP cpus requested (%d), exceeds max cpus "
                 "supported by machine `%s' (%d)\n", smp_cpus,  machine->name,