| Message ID | 20231114235628.534334-6-gshan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Unified CPU type check | expand |
On 11/14/23 15:56, Gavin Shan wrote: > Add helper cpu_model_from_type() to extract the CPU model name from > the CPU type name in two circumstances: (1) The CPU type name is the > combination of the CPU model name and suffix. (2) The CPU type name > is same to the CPU model name. > > The helper will be used in the subsequent commits to conver the > CPU type name to the CPU model name. > > Suggested-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Gavin Shan <gshan@redhat.com> > --- > cpu-target.c | 15 +++++++++++++++ > include/hw/core/cpu.h | 12 ++++++++++++ > 2 files changed, 27 insertions(+) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 15/11/23 00:56, Gavin Shan wrote: > Add helper cpu_model_from_type() to extract the CPU model name from > the CPU type name in two circumstances: (1) The CPU type name is the > combination of the CPU model name and suffix. (2) The CPU type name > is same to the CPU model name. > > The helper will be used in the subsequent commits to conver the > CPU type name to the CPU model name. > > Suggested-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Gavin Shan <gshan@redhat.com> > --- > cpu-target.c | 15 +++++++++++++++ > include/hw/core/cpu.h | 12 ++++++++++++ > 2 files changed, 27 insertions(+) > diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h > index c0c8320413..57ceb46bc1 100644 > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -779,6 +779,18 @@ void cpu_reset(CPUState *cpu); > */ > ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model); > > +/** > + * cpu_model_from_type: > + * @typename: The CPU type name > + * > + * Extract the CPU model name from the CPU type name. The > + * CPU type name is either the combination of the CPU model > + * name and suffix, or same to the CPU model name. > + * > + * Returns: CPU model name or NULL if the CPU class doesn't exist Worth adding: * The user should g_free() the string once no longer * needed. > + */ Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/cpu-target.c b/cpu-target.c index 508013e23d..c078c0e91b 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -241,6 +241,21 @@ void cpu_exec_initfn(CPUState *cpu) #endif } +char *cpu_model_from_type(const char *typename) +{ + const char *suffix = "-" CPU_RESOLVING_TYPE; + + if (!object_class_by_name(typename)) { + return NULL; + } + + if (g_str_has_suffix(typename, suffix)) { + return g_strndup(typename, strlen(typename) - strlen(suffix)); + } + + return g_strdup(typename); +} + const char *parse_cpu_option(const char *cpu_option) { ObjectClass *oc; diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index c0c8320413..57ceb46bc1 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -779,6 +779,18 @@ void cpu_reset(CPUState *cpu); */ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model); +/** + * cpu_model_from_type: + * @typename: The CPU type name + * + * Extract the CPU model name from the CPU type name. The + * CPU type name is either the combination of the CPU model + * name and suffix, or same to the CPU model name. + * + * Returns: CPU model name or NULL if the CPU class doesn't exist + */ +char *cpu_model_from_type(const char *typename); + /** * cpu_create: * @typename: The CPU type.
Add helper cpu_model_from_type() to extract the CPU model name from the CPU type name in two circumstances: (1) The CPU type name is the combination of the CPU model name and suffix. (2) The CPU type name is same to the CPU model name. The helper will be used in the subsequent commits to conver the CPU type name to the CPU model name. Suggested-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Gavin Shan <gshan@redhat.com> --- cpu-target.c | 15 +++++++++++++++ include/hw/core/cpu.h | 12 ++++++++++++ 2 files changed, 27 insertions(+)