mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/core: Rename smp_parse() -> machine_parse_smp_config()

Browse Source 
All methods related to MachineState are prefixed with "machine_".
smp_parse() does not need to be an exception. Rename it and
const'ify the SMPConfiguration argument, since it doesn't need
to be modified.

Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Tested-by: Yanan Wang <wangyanan55@huawei.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211216132015.815493-9-philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-11-11 10:21:23 +01:00
parent cf65000ae9
commit 3e2f14981c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/core/machine-smp.c
View File

@ -44,7 +44,8 @@ static char *cpu_hierarchy_to_string(MachineState *ms)
} }
/* /*
* smp_parse - Generic function used to parse the given SMP configuration * machine_parse_smp_config: Generic function used to parse the given
* SMP configuration
* *
* Any missing parameter in "cpus/maxcpus/sockets/cores/threads" will be * Any missing parameter in "cpus/maxcpus/sockets/cores/threads" will be
* automatically computed based on the provided ones. * automatically computed based on the provided ones.
@ -63,7 +64,8 @@ static char *cpu_hierarchy_to_string(MachineState *ms)
* introduced topology members which are likely to be target specific should * introduced topology members which are likely to be target specific should
* be directly set as 1 if they are omitted (e.g. dies for PC since 4.1). * be directly set as 1 if they are omitted (e.g. dies for PC since 4.1).
*/ */
void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp) void machine_parse_smp_config(MachineState *ms,
const SMPConfiguration *config, Error **errp)
{ {
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);
unsigned cpus = config->has_cpus ? config->cpus : 0; unsigned cpus = config->has_cpus ? config->cpus : 0;

2
hw/core/machine.c
View File

@ -761,7 +761,7 @@ static void machine_set_smp(Object *obj, Visitor *v, const char *name,
return; return;
} }
smp_parse(ms, config, errp); machine_parse_smp_config(ms, config, errp);
} }
static void machine_class_init(ObjectClass *oc, void *data) static void machine_class_init(ObjectClass *oc, void *data)

3
include/hw/boards.h
View File

@ -34,7 +34,8 @@ HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine);
void machine_set_cpu_numa_node(MachineState *machine, void machine_set_cpu_numa_node(MachineState *machine,
const CpuInstanceProperties *props, const CpuInstanceProperties *props,
Error **errp); Error **errp);
void smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp); void machine_parse_smp_config(MachineState *ms,
const SMPConfiguration *config, Error **errp);
/** /**
* machine_class_allow_dynamic_sysbus_dev: Add type to list of valid devices * machine_class_allow_dynamic_sysbus_dev: Add type to list of valid devices

8
tests/unit/test-smp-parse.c
View File

@ -337,7 +337,7 @@ static const struct SMPTestData data_with_dies_invalid[] = {
}, },
}; };
static char *smp_config_to_string(SMPConfiguration *config) static char *smp_config_to_string(const SMPConfiguration *config)
{ {
return g_strdup_printf( return g_strdup_printf(
"(SMPConfiguration) {\n" "(SMPConfiguration) {\n"
@ -371,7 +371,7 @@ static char *cpu_topology_to_string(const CpuTopology *topo)
topo->cores, topo->threads, topo->max_cpus); topo->cores, topo->threads, topo->max_cpus);
} }
static void check_parse(MachineState *ms, SMPConfiguration *config, static void check_parse(MachineState *ms, const SMPConfiguration *config,
const CpuTopology *expect_topo, const char *expect_err, const CpuTopology *expect_topo, const char *expect_err,
bool is_valid) bool is_valid)
{ {
@ -380,8 +380,8 @@ static void check_parse(MachineState *ms, SMPConfiguration *config,
g_autofree char *output_topo_str = NULL; g_autofree char *output_topo_str = NULL;
Error *err = NULL; Error *err = NULL;
/* call the generic parser smp_parse() */ /* call the generic parser */
smp_parse(ms, config, &err); machine_parse_smp_config(ms, config, &err);
output_topo_str = cpu_topology_to_string(&ms->smp); output_topo_str = cpu_topology_to_string(&ms->smp);