| Message ID | 20190628002844.24894-4-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | x86 CPU model versioning | expand |
On Thu, Jun 27, 2019 at 09:28:38PM -0300, Eduardo Habkost wrote: > When introducing versioned CPU models, the string at > X86CPUDefinition::model_id might not be the model-id we'll really > use. Instantiate a CPU object and check the model-id property on > "-cpu help" It would help understanding to illustrate this with an example of the different string that results before/after this change. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > (New patch, added to series in v2) > --- > target/i386/cpu.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1bdb906e9f..49bf92d3f9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3766,18 +3766,28 @@ static GSList *get_sorted_cpu_model_list(void) return list; } +static char *x86_cpu_class_get_model_id(X86CPUClass *xc) +{ + Object *obj = object_new(object_class_get_name(OBJECT_CLASS(xc))); + char *r = object_property_get_str(obj, "model-id", &error_abort); + object_unref(obj); + return r; +} + static void x86_cpu_list_entry(gpointer data, gpointer user_data) { ObjectClass *oc = data; X86CPUClass *cc = X86_CPU_CLASS(oc); char *name = x86_cpu_class_get_model_name(cc); - const char *desc = cc->model_description; - if (!desc && cc->cpu_def) { - desc = cc->cpu_def->model_id; + char *desc = g_strdup(cc->model_description); + + if (!desc) { + desc = x86_cpu_class_get_model_id(cc); } qemu_printf("x86 %-20s %-48s\n", name, desc); g_free(name); + g_free(desc); } /* list available CPU models and flags */
When introducing versioned CPU models, the string at X86CPUDefinition::model_id might not be the model-id we'll really use. Instantiate a CPU object and check the model-id property on "-cpu help" Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- (New patch, added to series in v2) --- target/i386/cpu.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)