aboutsummaryrefslogtreecommitdiff
path: root/hw/core
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-10-21 06:45:14 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2020-10-26 07:08:40 -0400
commit8b0e484c8bf82e07bb0439bff04e248c63cdc86a (patch)
tree9c2f2652df3cd40d181d890c950f1cfd0653963b /hw/core
parent2c920e4577b29702c0c01b0d491903c159df894a (diff)
downloadqemu-8b0e484c8bf82e07bb0439bff04e248c63cdc86a.zip
qemu-8b0e484c8bf82e07bb0439bff04e248c63cdc86a.tar.gz
qemu-8b0e484c8bf82e07bb0439bff04e248c63cdc86a.tar.bz2
machine: move SMP initialization from vl.c
Initialize the object's values from the class when the object is created, no need to have vl.c do it for us. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/core')
-rw-r--r--hw/core/machine.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 57463ad..c5e0e79 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -907,6 +907,13 @@ static void machine_initfn(Object *obj)
/* Register notifier when init is done for sysbus sanity checks */
ms->sysbus_notifier.notify = machine_init_notify;
qemu_add_machine_init_done_notifier(&ms->sysbus_notifier);
+
+ /* default to mc->default_cpus */
+ ms->smp.cpus = mc->default_cpus;
+ ms->smp.max_cpus = mc->default_cpus;
+ ms->smp.cores = 1;
+ ms->smp.threads = 1;
+ ms->smp.sockets = 1;
}
static void machine_finalize(Object *obj)