summaryrefslogtreecommitdiffstats
path: root/softmmu
diff options
context:
space:
mode:
authorPaolo Bonzini2020-10-21 13:23:49 +0200
committerPaolo Bonzini2020-10-26 12:08:40 +0100
commit2c920e4577b29702c0c01b0d491903c159df894a (patch)
tree034e0d069c332bda5d988651a3bc5c047cd113a5 /softmmu
parentmachine: remove deprecated -machine enforce-config-section option (diff)
downloadqemu-2c920e4577b29702c0c01b0d491903c159df894a.tar.gz
qemu-2c920e4577b29702c0c01b0d491903c159df894a.tar.xz
qemu-2c920e4577b29702c0c01b0d491903c159df894a.zip
machine: move UP defaults to class_base_init
Clean up vl.c, default min/max/default_cpus to uniprocessor directly in the QOM class initialization code. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'softmmu')
-rw-r--r--softmmu/vl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 09b033ff73..9b67ea300e 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3970,11 +3970,6 @@ void qemu_init(int argc, char **argv, char **envp)
exit(0);
}
- /* machine_class: default to UP */
- machine_class->max_cpus = machine_class->max_cpus ?: 1;
- machine_class->min_cpus = machine_class->min_cpus ?: 1;
- machine_class->default_cpus = machine_class->default_cpus ?: 1;
-
/* default to machine_class->default_cpus */
current_machine->smp.cpus = machine_class->default_cpus;
current_machine->smp.max_cpus = machine_class->default_cpus;