summaryrefslogtreecommitdiffstats
path: root/vl.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2015-07-22 15:59:50 +0200
committerEduardo Habkost <ehabkost@redhat.com>2015-10-02 16:22:01 -0300
commita32ef3bfc12c8d0588f43f74dcc5280885bbdb30 (patch)
tree7c85f55a09e1e83d78110c2c7452b88cdd6ff8a7 /vl.c
parented256144cd6f0ca2ff59fc3fc8dca547506f433b (diff)
downloadhqemu-a32ef3bfc12c8d0588f43f74dcc5280885bbdb30.zip
hqemu-a32ef3bfc12c8d0588f43f74dcc5280885bbdb30.tar.gz
vl: Add another sanity check to smp_parse() function
The code in smp_parse already checks the topology information for sockets * cores * threads < cpus and bails out with an error in that case. However, it is still possible to supply a bad configuration the other way round, e.g. with: qemu-system-xxx -smp 4,sockets=1,cores=4,threads=2 QEMU then still starts the guest, with topology configuration that is rather incomprehensible and likely not what the user wanted. So let's add another check to refuse such wrong configurations. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 8d1846c..f2bd8d2 100644
--- a/vl.c
+++ b/vl.c
@@ -1223,7 +1223,13 @@ static void smp_parse(QemuOpts *opts)
exit(1);
}
- max_cpus = qemu_opt_get_number(opts, "maxcpus", 0);
+ max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus);
+ if (sockets * cores * threads > max_cpus) {
+ fprintf(stderr, "cpu topology: error: "
+ "sockets (%u) * cores (%u) * threads (%u) > maxcpus (%u)\n",
+ sockets, cores, threads, max_cpus);
+ exit(1);
+ }
smp_cpus = cpus;
smp_cores = cores > 0 ? cores : 1;
OpenPOWER on IntegriCloud