diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2020-10-21 06:49:31 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-12-10 12:15:11 -0500 |
commit | 3df8c4f31a60101c61d7f49ce0a3635690bed579 (patch) | |
tree | 568bf40f3354244a5cac19b2202c2509a409fa08 /softmmu | |
parent | 991c180d740c04c2f8c08c8783ad868fc832589f (diff) | |
download | qemu-3df8c4f31a60101c61d7f49ce0a3635690bed579.zip qemu-3df8c4f31a60101c61d7f49ce0a3635690bed579.tar.gz qemu-3df8c4f31a60101c61d7f49ce0a3635690bed579.tar.bz2 |
vl: extract validation of -smp to machine.c
Once smp_parse is done, the validation operates on the MachineState.
There is no reason for that code to be in vl.c.
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'softmmu')
-rw-r--r-- | softmmu/vl.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index 3819a4a..69d54b2 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3976,24 +3976,8 @@ void qemu_init(int argc, char **argv, char **envp) exit(0); } - machine_class->smp_parse(current_machine, - qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); - - /* sanity-check smp_cpus and max_cpus against machine_class */ - if (current_machine->smp.cpus < machine_class->min_cpus) { - error_report("Invalid SMP CPUs %d. The min CPUs " - "supported by machine '%s' is %d", - current_machine->smp.cpus, - machine_class->name, machine_class->min_cpus); - exit(1); - } - if (current_machine->smp.max_cpus > machine_class->max_cpus) { - error_report("Invalid SMP CPUs %d. The max CPUs " - "supported by machine '%s' is %d", - current_machine->smp.max_cpus, - machine_class->name, machine_class->max_cpus); - exit(1); - } + machine_smp_parse(current_machine, + qemu_opts_find(qemu_find_opts("smp-opts"), NULL), &error_fatal); if (mem_prealloc) { char *val; |