haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
stable-2.5
Thomas Huth 2015-07-22 15:59:50 +02:00 committed by Eduardo Habkost
parent ed256144cd
commit a32ef3bfc1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vl.c
View File

@ -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;