motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-29 13:23:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/core: Add machine_class_default_cpu_type()

Browse source 
Add a helper to return a machine default CPU type.

If this machine is restricted to a single CPU type,
use it as default, obviously.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231116163726.28952-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-11-16 17:33:12 +01:00
parent 4b26aa9f3a
commit 62b4a227a3
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/core/machine.c
View file

@ -1390,6 +1390,14 @@ out:
return r; return r;
} }
const char *machine_class_default_cpu_type(MachineClass *mc)
{
if (mc->valid_cpu_types && !mc->valid_cpu_types[1]) {
/* Only a single CPU type allowed: use it as default. */
return mc->valid_cpu_types[0];
}
return mc->default_cpu_type;
}
void machine_run_board_init(MachineState *machine, const char *mem_path, Error **errp) void machine_run_board_init(MachineState *machine, const char *mem_path, Error **errp)
{ {

6
include/hw/boards.h
View file

@ -24,6 +24,12 @@ OBJECT_DECLARE_TYPE(MachineState, MachineClass, MACHINE)
extern MachineState *current_machine; extern MachineState *current_machine;
/**
* machine_class_default_cpu_type: Return the machine default CPU type.
* @mc: Machine class
*/
const char *machine_class_default_cpu_type(MachineClass *mc);
void machine_add_audiodev_property(MachineClass *mc); void machine_add_audiodev_property(MachineClass *mc);
void machine_run_board_init(MachineState *machine, const char *mem_path, Error **errp); void machine_run_board_init(MachineState *machine, const char *mem_path, Error **errp);
bool machine_usb(MachineState *machine); bool machine_usb(MachineState *machine);

2
system/vl.c
View file

@ -3737,7 +3737,7 @@ void qemu_init(int argc, char **argv)
migration_object_init(); migration_object_init();
/* parse features once if machine provides default cpu_type */ /* parse features once if machine provides default cpu_type */
current_machine->cpu_type = machine_class->default_cpu_type; current_machine->cpu_type = machine_class_default_cpu_type(machine_class);
if (cpu_option) { if (cpu_option) {
current_machine->cpu_type = parse_cpu_option(cpu_option); current_machine->cpu_type = parse_cpu_option(cpu_option);
} }