[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/17] machine: move SMP initialization from vl.c
From: |
Paolo Bonzini |
Subject: |
[PULL 17/17] machine: move SMP initialization from vl.c |
Date: |
Mon, 26 Oct 2020 09:51:31 -0400 |
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>
---
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 57463ad77a..c5e0e79e6d 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)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 9b67ea300e..b7d7f43c88 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3970,13 +3970,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
- [PULL 00/17] Build system changes and misc fixes for QEMU 5.2 soft freeze, Paolo Bonzini, 2020/10/26
- [PULL 03/17] do not use colons in test names, Paolo Bonzini, 2020/10/26
- [PULL 08/17] Makefile: separate meson rerun from the rest of the ninja invocation, Paolo Bonzini, 2020/10/26
- [PULL 04/17] hw/core/qdev-clock: add a reference on aliased clocks, Paolo Bonzini, 2020/10/26
- [PULL 05/17] qtest: unbreak non-TCG builds in bios-tables-test, Paolo Bonzini, 2020/10/26
- [PULL 02/17] meson: rewrite curses/iconv test, Paolo Bonzini, 2020/10/26
- [PULL 07/17] Remove deprecated -no-kvm option, Paolo Bonzini, 2020/10/26
- [PULL 06/17] replay: do not build if TCG is not available, Paolo Bonzini, 2020/10/26
- [PULL 17/17] machine: move SMP initialization from vl.c,
Paolo Bonzini <=
- [PULL 12/17] configure: move install_blobs from configure to meson, Paolo Bonzini, 2020/10/26
- [PULL 15/17] machine: remove deprecated -machine enforce-config-section option, Paolo Bonzini, 2020/10/26
- [PULL 13/17] WHPX: Fix WHPX build break, Paolo Bonzini, 2020/10/26
- [PULL 11/17] configure: remove unused variable from config-host.mak, Paolo Bonzini, 2020/10/26
- [PULL 01/17] build: fix macOS --enable-modules build, Paolo Bonzini, 2020/10/26
[PULL 14/17] win32: boot broken when bind & data dir are the same, Paolo Bonzini, 2020/10/26