[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/22] machine: move SMP initialization from vl.c
From: |
Paolo Bonzini |
Subject: |
[PATCH 04/22] machine: move SMP initialization from vl.c |
Date: |
Wed, 21 Oct 2020 16:56:58 -0400 |
Initialize the object's values from the class when the object is
created, no need to have vl.c do it for us.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/core/machine.c | 7 +++++++
softmmu/vl.c | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index d3a8450b1f..7efeac03b3 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -908,6 +908,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)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 75bc686397..05422a15ee 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3966,13 +3966,6 @@ void qemu_init(int argc, char **argv, char **envp)
exit(0);
}
- /* default to machine_class->default_cpus */
- current_machine->smp.cpus = machine_class->default_cpus;
- current_machine->smp.max_cpus = machine_class->default_cpus;
- current_machine->smp.cores = 1;
- current_machine->smp.threads = 1;
- current_machine->smp.sockets = 1;
-
machine_class->smp_parse(current_machine,
qemu_opts_find(qemu_find_opts("smp-opts"), NULL));
--
2.26.2
- [RFC PATCH 00/22] cleanup qemu_init and make sense of command line processing, Paolo Bonzini, 2020/10/21
- [PATCH 03/22] machine: move UP defaults to class_base_init, Paolo Bonzini, 2020/10/21
- [PATCH 04/22] machine: move SMP initialization from vl.c,
Paolo Bonzini <=
- [PATCH 02/22] machine: remove deprecated -machine enforce-config-section option, Paolo Bonzini, 2020/10/21
- [PATCH 07/22] trace: remove argument from trace_init_file, Paolo Bonzini, 2020/10/21
- [PATCH 06/22] vl: remove bogus check, Paolo Bonzini, 2020/10/21
- [PATCH 15/22] vl: extract various command line desugaring snippets to a new function, Paolo Bonzini, 2020/10/21
- [PATCH 08/22] vl: split various early command line options to a separate function, Paolo Bonzini, 2020/10/21
- [PATCH 05/22] vl: extract validation of -smp to machine.c, Paolo Bonzini, 2020/10/21
- [PATCH 01/22] semihosting: fix order of initialization functions, Paolo Bonzini, 2020/10/21