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.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/boards.h | 3 ++-
hw/core/machine-smp.c | 6 ++++--
hw/core/machine.c | 2 +-
tests/unit/test-smp-parse.c | 8 ++++----
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 9c1c1901046..7597cec4400 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -34,7 +34,8 @@ HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine);
void machine_set_cpu_numa_node(MachineState *machine,
const CpuInstanceProperties *props,
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
diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
index 116a0cbbfab..2cbfd574293 100644
--- a/hw/core/machine-smp.c
+++ b/hw/core/machine-smp.c
@@ -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
* 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
* 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);
unsigned cpus = config->has_cpus ? config->cpus : 0;
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 26ec54e7261..a2d3c9969d9 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -760,7 +760,7 @@ static void machine_set_smp(Object *obj, Visitor *v, const char *name,
return;
}
- smp_parse(ms, config, errp);
+ machine_parse_smp_config(ms, config, errp);
}
static void machine_class_init(ObjectClass *oc, void *data)
diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
index 11109752799..b158ebb16b1 100644
--- a/tests/unit/test-smp-parse.c
+++ b/tests/unit/test-smp-parse.c
@@ -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(
"(SMPConfiguration) {\n"
@@ -371,7 +371,7 @@ static char *cpu_topology_to_string(const CpuTopology *topo)
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,
bool is_valid)
{
@@ -380,8 +380,8 @@ static void check_parse(MachineState *ms, SMPConfiguration *config,
g_autofree char *output_topo_str = NULL;
Error *err = NULL;
- /* call the generic parser smp_parse() */
- smp_parse(ms, config, &err);
+ /* call the generic parser */
+ machine_parse_smp_config(ms, config, &err);
output_topo_str = cpu_topology_to_string(&ms->smp);
--
2.31.1
On 2021/11/11 18:03, Philippe Mathieu-Daudé wrote:
> 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.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> include/hw/boards.h | 3 ++-
> hw/core/machine-smp.c | 6 ++++--
> hw/core/machine.c | 2 +-
> tests/unit/test-smp-parse.c | 8 ++++----
> 4 files changed, 11 insertions(+), 8 deletions(-)
Reviewed-by: Yanan Wang <wangyanan55@huawei.com>
Tested-by: Yanan Wang <wangyanan55@huawei.com>
Thanks,
Yanan
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 9c1c1901046..7597cec4400 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -34,7 +34,8 @@ HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine);
> void machine_set_cpu_numa_node(MachineState *machine,
> const CpuInstanceProperties *props,
> 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
> diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
> index 116a0cbbfab..2cbfd574293 100644
> --- a/hw/core/machine-smp.c
> +++ b/hw/core/machine-smp.c
> @@ -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
> * 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
> * 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);
> unsigned cpus = config->has_cpus ? config->cpus : 0;
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 26ec54e7261..a2d3c9969d9 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -760,7 +760,7 @@ static void machine_set_smp(Object *obj, Visitor *v, const char *name,
> return;
> }
>
> - smp_parse(ms, config, errp);
> + machine_parse_smp_config(ms, config, errp);
> }
>
> static void machine_class_init(ObjectClass *oc, void *data)
> diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c
> index 11109752799..b158ebb16b1 100644
> --- a/tests/unit/test-smp-parse.c
> +++ b/tests/unit/test-smp-parse.c
> @@ -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(
> "(SMPConfiguration) {\n"
> @@ -371,7 +371,7 @@ static char *cpu_topology_to_string(const CpuTopology *topo)
> 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,
> bool is_valid)
> {
> @@ -380,8 +380,8 @@ static void check_parse(MachineState *ms, SMPConfiguration *config,
> g_autofree char *output_topo_str = NULL;
> Error *err = NULL;
>
> - /* call the generic parser smp_parse() */
> - smp_parse(ms, config, &err);
> + /* call the generic parser */
> + machine_parse_smp_config(ms, config, &err);
>
> output_topo_str = cpu_topology_to_string(&ms->smp);
>
On 11/11/21 11:03 AM, Philippe Mathieu-Daudé wrote: > 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. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@redhat.com> > --- > include/hw/boards.h | 3 ++- > hw/core/machine-smp.c | 6 ++++-- > hw/core/machine.c | 2 +- > tests/unit/test-smp-parse.c | 8 ++++---- > 4 files changed, 11 insertions(+), 8 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
© 2016 - 2025 Red Hat, Inc.