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

machine: move common smp_parse code to caller

Browse source 
Most of smp_parse and pc_smp_parse is guarded by an "if (opts)"
conditional, and the rest is common to both function.  Move the
conditional and the common code to the caller, machine_smp_parse.

Move the replay_add_blocker call after all errors are checked for.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210617155308.928754-8-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-06-17 17:53:04 +02:00
parent 67872eb8ed
commit 593d3c5148
2 changed files with 107 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
hw/core/machine.c
View file

@ -741,67 +741,59 @@ void machine_set_cpu_numa_node(MachineState *machine,
static void smp_parse(MachineState *ms, QemuOpts *opts) static void smp_parse(MachineState *ms, QemuOpts *opts)
{ {
if (opts) { unsigned cpus = qemu_opt_get_number(opts, "cpus", 0);
unsigned cpus = qemu_opt_get_number(opts, "cpus", 0); unsigned sockets = qemu_opt_get_number(opts, "sockets", 0);
unsigned sockets = qemu_opt_get_number(opts, "sockets", 0); unsigned cores = qemu_opt_get_number(opts, "cores", 0);
unsigned cores = qemu_opt_get_number(opts, "cores", 0); unsigned threads = qemu_opt_get_number(opts, "threads", 0);
unsigned threads = qemu_opt_get_number(opts, "threads", 0);
/* compute missing values, prefer sockets over cores over threads */ /* compute missing values, prefer sockets over cores over threads */
if (cpus == 0 || sockets == 0) { if (cpus == 0 || sockets == 0) {
cores = cores > 0 ? cores : 1; cores = cores > 0 ? cores : 1;
threads = threads > 0 ? threads : 1; threads = threads > 0 ? threads : 1;
if (cpus == 0) { if (cpus == 0) {
sockets = sockets > 0 ? sockets : 1; sockets = sockets > 0 ? sockets : 1;
cpus = cores * threads * sockets; cpus = cores * threads * sockets;
} else { } else {
ms->smp.max_cpus = ms->smp.max_cpus =
qemu_opt_get_number(opts, "maxcpus", cpus); qemu_opt_get_number(opts, "maxcpus", cpus);
sockets = ms->smp.max_cpus / (cores * threads); sockets = ms->smp.max_cpus / (cores * threads);
}
} 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) < "
"smp_cpus (%u)",
sockets, cores, threads, cpus);
exit(1);
} }
} else if (cores == 0) {
ms->smp.max_cpus = threads = threads > 0 ? threads : 1;
qemu_opt_get_number(opts, "maxcpus", cpus); cores = cpus / (sockets * threads);
cores = cores > 0 ? cores : 1;
if (ms->smp.max_cpus < cpus) { } else if (threads == 0) {
error_report("maxcpus must be equal to or greater than smp"); threads = cpus / (cores * sockets);
exit(1); threads = threads > 0 ? threads : 1;
} } else if (sockets * cores * threads < cpus) {
error_report("cpu topology: "
if (sockets * cores * threads != ms->smp.max_cpus) { "sockets (%u) * cores (%u) * threads (%u) < "
error_report("Invalid CPU topology: " "smp_cpus (%u)",
"sockets (%u) * cores (%u) * threads (%u) " sockets, cores, threads, cpus);
"!= maxcpus (%u)", exit(1);
sockets, cores, threads,
ms->smp.max_cpus);
exit(1);
}
ms->smp.cpus = cpus;
ms->smp.cores = cores;
ms->smp.threads = threads;
ms->smp.sockets = sockets;
} }
if (ms->smp.cpus > 1) { ms->smp.max_cpus =
Error *blocker = NULL; qemu_opt_get_number(opts, "maxcpus", cpus);
error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp");
replay_add_blocker(blocker); if (ms->smp.max_cpus < cpus) {
error_report("maxcpus must be equal to or greater than smp");
exit(1);
} }
if (sockets * cores * threads != ms->smp.max_cpus) {
error_report("Invalid CPU topology: "
"sockets (%u) * cores (%u) * threads (%u) "
"!= maxcpus (%u)",
sockets, cores, threads,
ms->smp.max_cpus);
exit(1);
}
ms->smp.cpus = cpus;
ms->smp.cores = cores;
ms->smp.threads = threads;
ms->smp.sockets = sockets;
} }
static void machine_class_init(ObjectClass *oc, void *data) static void machine_class_init(ObjectClass *oc, void *data)
@ -1135,7 +1127,9 @@ bool machine_smp_parse(MachineState *ms, QemuOpts *opts, Error **errp)
{ {
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);
mc->smp_parse(ms, opts); if (opts) {
mc->smp_parse(ms, opts);
}
/* sanity-check smp_cpus and max_cpus against mc */ /* sanity-check smp_cpus and max_cpus against mc */
if (ms->smp.cpus < mc->min_cpus) { if (ms->smp.cpus < mc->min_cpus) {
@ -1151,6 +1145,12 @@ bool machine_smp_parse(MachineState *ms, QemuOpts *opts, Error **errp)
mc->name, mc->max_cpus); mc->name, mc->max_cpus);
return false; return false;
} }
if (ms->smp.cpus > 1) {
Error *blocker = NULL;
error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp");
replay_add_blocker(blocker);
}
return true; return true;
} }

108
hw/i386/pc.c
View file

@ -712,69 +712,61 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
*/ */
void pc_smp_parse(MachineState *ms, QemuOpts *opts) void pc_smp_parse(MachineState *ms, QemuOpts *opts)
{ {
if (opts) { unsigned cpus = qemu_opt_get_number(opts, "cpus", 0);
unsigned cpus = qemu_opt_get_number(opts, "cpus", 0); unsigned sockets = qemu_opt_get_number(opts, "sockets", 0);
unsigned sockets = qemu_opt_get_number(opts, "sockets", 0); unsigned dies = qemu_opt_get_number(opts, "dies", 1);
unsigned dies = qemu_opt_get_number(opts, "dies", 1); unsigned cores = qemu_opt_get_number(opts, "cores", 0);
unsigned cores = qemu_opt_get_number(opts, "cores", 0); unsigned threads = qemu_opt_get_number(opts, "threads", 0);
unsigned threads = qemu_opt_get_number(opts, "threads", 0);
/* compute missing values, prefer sockets over cores over threads */ /* compute missing values, prefer sockets over cores over threads */
if (cpus == 0 || sockets == 0) { if (cpus == 0 || sockets == 0) {
cores = cores > 0 ? cores : 1; cores = cores > 0 ? cores : 1;
threads = threads > 0 ? threads : 1; threads = threads > 0 ? threads : 1;
if (cpus == 0) { if (cpus == 0) {
sockets = sockets > 0 ? sockets : 1; sockets = sockets > 0 ? sockets : 1;
cpus = cores * threads * dies * sockets; cpus = cores * threads * dies * sockets;
} else { } else {
ms->smp.max_cpus = ms->smp.max_cpus =
qemu_opt_get_number(opts, "maxcpus", cpus); qemu_opt_get_number(opts, "maxcpus", cpus);
sockets = ms->smp.max_cpus / (cores * threads * dies); sockets = ms->smp.max_cpus / (cores * threads * dies);
}
} else if (cores == 0) {
threads = threads > 0 ? threads : 1;
cores = cpus / (sockets * dies * threads);
cores = cores > 0 ? cores : 1;
} else if (threads == 0) {
threads = cpus / (cores * dies * sockets);
threads = threads > 0 ? threads : 1;
} else if (sockets * dies * cores * threads < cpus) {
error_report("cpu topology: "
"sockets (%u) * dies (%u) * cores (%u) * threads (%u) < "
"smp_cpus (%u)",
sockets, dies, cores, threads, cpus);
exit(1);
} }
} else if (cores == 0) {
ms->smp.max_cpus = threads = threads > 0 ? threads : 1;
qemu_opt_get_number(opts, "maxcpus", cpus); cores = cpus / (sockets * dies * threads);
cores = cores > 0 ? cores : 1;
if (ms->smp.max_cpus < cpus) { } else if (threads == 0) {
error_report("maxcpus must be equal to or greater than smp"); threads = cpus / (cores * dies * sockets);
exit(1); threads = threads > 0 ? threads : 1;
} } else if (sockets * dies * cores * threads < cpus) {
error_report("cpu topology: "
if (sockets * dies * cores * threads != ms->smp.max_cpus) { "sockets (%u) * dies (%u) * cores (%u) * threads (%u) < "
error_report("Invalid CPU topology deprecated: " "smp_cpus (%u)",
"sockets (%u) * dies (%u) * cores (%u) * threads (%u) " sockets, dies, cores, threads, cpus);
"!= maxcpus (%u)", exit(1);
sockets, dies, cores, threads,
ms->smp.max_cpus);
exit(1);
}
ms->smp.cpus = cpus;
ms->smp.cores = cores;
ms->smp.threads = threads;
ms->smp.sockets = sockets;
ms->smp.dies = dies;
} }
if (ms->smp.cpus > 1) { ms->smp.max_cpus =
Error *blocker = NULL; qemu_opt_get_number(opts, "maxcpus", cpus);
error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp");
replay_add_blocker(blocker); if (ms->smp.max_cpus < cpus) {
error_report("maxcpus must be equal to or greater than smp");
exit(1);
} }
if (sockets * dies * cores * threads != ms->smp.max_cpus) {
error_report("Invalid CPU topology deprecated: "
"sockets (%u) * dies (%u) * cores (%u) * threads (%u) "
"!= maxcpus (%u)",
sockets, dies, cores, threads,
ms->smp.max_cpus);
exit(1);
}
ms->smp.cpus = cpus;
ms->smp.cores = cores;
ms->smp.threads = threads;
ms->smp.sockets = sockets;
ms->smp.dies = dies;
} }
static static