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

16
hw/core/machine.c
View file

@ -741,7 +741,6 @@ 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);
@ -795,13 +794,6 @@ static void smp_parse(MachineState *ms, QemuOpts *opts)
ms->smp.cores = cores; ms->smp.cores = cores;
ms->smp.threads = threads; ms->smp.threads = threads;
ms->smp.sockets = sockets; ms->smp.sockets = sockets;
}
if (ms->smp.cpus > 1) {
Error *blocker = NULL;
error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp");
replay_add_blocker(blocker);
}
} }
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);
if (opts) {
mc->smp_parse(ms, 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;
} }

8
hw/i386/pc.c
View file

@ -712,7 +712,6 @@ 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);
@ -768,13 +767,6 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts)
ms->smp.threads = threads; ms->smp.threads = threads;
ms->smp.sockets = sockets; ms->smp.sockets = sockets;
ms->smp.dies = dies; ms->smp.dies = dies;
}
if (ms->smp.cpus > 1) {
Error *blocker = NULL;
error_setg(&blocker, QERR_REPLAY_NOT_SUPPORTED, "smp");
replay_add_blocker(blocker);
}
} }
static static