SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vl: extract validation of -smp to machine.c

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2020-10-21 06:49:31 -04:00
parent 991c180d74
commit 3df8c4f31a
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/core/machine.c
View File

@ -1077,6 +1077,29 @@ MemoryRegion *machine_consume_memdev(MachineState *machine,
return ret; return ret;
} }
bool machine_smp_parse(MachineState *ms, QemuOpts *opts, Error **errp)
{
MachineClass *mc = MACHINE_GET_CLASS(ms);
mc->smp_parse(ms, opts);
/* sanity-check smp_cpus and max_cpus against mc */
if (ms->smp.cpus < mc->min_cpus) {
error_setg(errp, "Invalid SMP CPUs %d. The min CPUs "
"supported by machine '%s' is %d",
ms->smp.cpus,
mc->name, mc->min_cpus);
return false;
} else if (ms->smp.max_cpus > mc->max_cpus) {
error_setg(errp, "Invalid SMP CPUs %d. The max CPUs "
"supported by machine '%s' is %d",
current_machine->smp.max_cpus,
mc->name, mc->max_cpus);
return false;
}
return true;
}
void machine_run_board_init(MachineState *machine) void machine_run_board_init(MachineState *machine)
{ {
MachineClass *machine_class = MACHINE_GET_CLASS(machine); MachineClass *machine_class = MACHINE_GET_CLASS(machine);

1
include/hw/boards.h
View File

@ -26,6 +26,7 @@ OBJECT_DECLARE_TYPE(MachineState, MachineClass, MACHINE)
extern MachineState *current_machine; extern MachineState *current_machine;
void machine_run_board_init(MachineState *machine); void machine_run_board_init(MachineState *machine);
bool machine_smp_parse(MachineState *ms, QemuOpts *opts, Error **errp);
bool machine_usb(MachineState *machine); bool machine_usb(MachineState *machine);
int machine_phandle_start(MachineState *machine); int machine_phandle_start(MachineState *machine);
bool machine_dump_guest_core(MachineState *machine); bool machine_dump_guest_core(MachineState *machine);

20
softmmu/vl.c
View File

@ -3976,24 +3976,8 @@ void qemu_init(int argc, char **argv, char **envp)
exit(0); exit(0);
} }
machine_class->smp_parse(current_machine, machine_smp_parse(current_machine,
qemu_opts_find(qemu_find_opts("smp-opts"), NULL)); qemu_opts_find(qemu_find_opts("smp-opts"), NULL), &error_fatal);
/* 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);
}
if (mem_prealloc) { if (mem_prealloc) {
char *val; char *val;