| Message ID | 20230907003553.1636896-2-gshan@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Unified CPU type check | expand |
On 7/9/23 02:35, 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 patches to conver the "patches to conver" -> "commits to convert" > CPU type name to the CPU model name. > > Suggested-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Gavin Shan <gshan@redhat.com> > --- > cpu.c | 16 ++++++++++++++++ > include/hw/core/cpu.h | 12 ++++++++++++ > 2 files changed, 28 insertions(+)
On 9/7/23 18:54, Philippe Mathieu-Daudé wrote: > On 7/9/23 02:35, 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 patches to conver the > > "patches to conver" -> "commits to convert" > Thanks, it will be fixed in next respin. >> CPU type name to the CPU model name. >> >> Suggested-by: Igor Mammedov <imammedo@redhat.com> >> Signed-off-by: Gavin Shan <gshan@redhat.com> >> --- >> cpu.c | 16 ++++++++++++++++ >> include/hw/core/cpu.h | 12 ++++++++++++ >> 2 files changed, 28 insertions(+) > Thanks, Gavin
diff --git a/cpu.c b/cpu.c index 1c948d1161..a19e33ff96 100644 --- a/cpu.c +++ b/cpu.c @@ -284,6 +284,22 @@ const char *parse_cpu_option(const char *cpu_option) return cpu_type; } +char *cpu_model_from_type(const char *typename) +{ + const char *suffix = "-" CPU_RESOLVING_TYPE; + + if (!object_class_by_name(typename)) { + return NULL; + } + + if (strlen(typename) > strlen(suffix) && + !strcmp(typename + strlen(typename) - strlen(suffix), suffix)) { + return g_strndup(typename, strlen(typename) - strlen(suffix)); + } + + return g_strdup(typename); +} + void list_cpus(void) { /* XXX: implement xxx_cpu_list for targets that still miss it */ diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 92a4234439..6e76d95490 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -657,6 +657,18 @@ CPUState *cpu_create(const char *typename); */ const char *parse_cpu_option(const char *cpu_option); +/** + * 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 + */ +char *cpu_model_from_type(const char *typename); + /** * cpu_has_work: * @cpu: The vCPU to check.
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 patches 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.c | 16 ++++++++++++++++ include/hw/core/cpu.h | 12 ++++++++++++ 2 files changed, 28 insertions(+)