Commit 66f37d36 authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

vl: smp_parse: fix regression 



Commit 0544edd8 "vl: smp_parse: cleanups" regressed any -smp
config that left either cores or threads unspecified, and specified
a topology supporting more cpus than the given online cpus. The
correct way to calculate the missing parameter would be to use
maxcpus, but it's too late to change that now. Restore the old
way, which is to calculate it with the online cpus (as is still
done), but then, if the result is zero, just set it to one.

Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Message-Id: <1466526844-29245-1-git-send-email-drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8f242cb7

vl.c

+2 −0
Original line number Diff line number Diff line
@@ -1234,8 +1234,10 @@ static void smp_parse(QemuOpts *opts) 
        } else if (cores == 0) {

            threads = threads > 0 ? threads : 1;

            cores = cpus / (sockets * threads);

            cores = cores > 0 ? cores : 1;

        } else if (threads == 0) {

            threads = cpus / (cores * sockets);

            threads = threads > 0 ? threads : 1;

        } else if (sockets * cores * threads < cpus) {

            error_report("cpu topology: "

                         "sockets (%u) * cores (%u) * threads (%u) < "