[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/13] target/i386: Add new property note to versioned CPU models
From: |
Eduardo Habkost |
Subject: |
[PULL 02/13] target/i386: Add new property note to versioned CPU models |
Date: |
Tue, 17 Mar 2020 21:17:37 -0400 |
From: Tao Xu <address@hidden>
Add additional information for -cpu help to indicate the changes in this
version of CPU model.
Suggested-by: Eduardo Habkost <address@hidden>
Signed-off-by: Tao Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
target/i386/cpu.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index c3b5cf1369..dc78494167 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1690,6 +1690,7 @@ typedef struct PropValue {
typedef struct X86CPUVersionDefinition {
X86CPUVersion version;
const char *alias;
+ const char *note;
PropValue *props;
} X86CPUVersionDefinition;
@@ -1720,6 +1721,7 @@ struct X86CPUModel {
X86CPUDefinition *cpudef;
/* CPU model version */
X86CPUVersion version;
+ const char *note;
/*
* If true, this is an alias CPU model.
* This matters only for "-cpu help" and query-cpu-definitions
@@ -4861,6 +4863,7 @@ static void x86_cpu_list_entry(gpointer data, gpointer
user_data)
g_autofree char *name = x86_cpu_class_get_model_name(cc);
g_autofree char *desc = g_strdup(cc->model_description);
g_autofree char *alias_of = x86_cpu_class_get_alias_of(cc);
+ g_autofree char *model_id = x86_cpu_class_get_model_id(cc);
if (!desc && alias_of) {
if (cc->model && cc->model->version == CPU_VERSION_AUTO) {
@@ -4869,11 +4872,14 @@ static void x86_cpu_list_entry(gpointer data, gpointer
user_data)
desc = g_strdup_printf("(alias of %s)", alias_of);
}
}
+ if (!desc && cc->model && cc->model->note) {
+ desc = g_strdup_printf("%s [%s]", model_id, cc->model->note);
+ }
if (!desc) {
- desc = x86_cpu_class_get_model_id(cc);
+ desc = g_strdup_printf("%s", model_id);
}
- qemu_printf("x86 %-20s %-48s\n", name, desc);
+ qemu_printf("x86 %-20s %-58s\n", name, desc);
}
/* list available CPU models and flags */
@@ -5350,6 +5356,7 @@ static void x86_register_cpudef_types(X86CPUDefinition
*def)
x86_cpu_versioned_model_name(def, vdef->version);
m->cpudef = def;
m->version = vdef->version;
+ m->note = vdef->note;
x86_register_cpu_model_type(name, m);
if (vdef->alias) {
--
2.24.1
- [PULL 00/13] x86 and machine queue for 5.0 soft freeze, Eduardo Habkost, 2020/03/17
- [PULL 01/13] target/i386: Add Denverton-v2 (no MPX) CPU model, Eduardo Habkost, 2020/03/17
- [PULL 02/13] target/i386: Add new property note to versioned CPU models,
Eduardo Habkost <=
- [PULL 03/13] i386: Add missing cpu feature bits in EPYC model, Eduardo Habkost, 2020/03/17
- [PULL 06/13] machine/memory encryption: Disable mem merge, Eduardo Habkost, 2020/03/17
- [PULL 05/13] hw/i386: Rename X86CPUTopoInfo structure to X86CPUTopoIDs, Eduardo Habkost, 2020/03/17
- [PULL 08/13] hw/i386: Introduce X86CPUTopoInfo to contain topology info, Eduardo Habkost, 2020/03/17
- [PULL 09/13] hw/i386: Consolidate topology functions, Eduardo Habkost, 2020/03/17
- [PULL 04/13] i386: Add 2nd Generation AMD EPYC processors, Eduardo Habkost, 2020/03/17
- [PULL 11/13] hw/i386: Remove unnecessary initialization in x86_cpu_new, Eduardo Habkost, 2020/03/17
- [PULL 07/13] cpu: Use DeviceClass reset instead of a special CPUClass reset, Eduardo Habkost, 2020/03/17
- [PULL 12/13] hw/i386: Update structures to save the number of nodes per package, Eduardo Habkost, 2020/03/17