Rename the variable, to avoid confusion between the actual CPU model name and the -cpu string argument (that may contain additional parameters).
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> --- target-i386/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c2594bd..57acf3a 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1521,7 +1521,7 @@ static int cpudef_2_x86_cpu(X86CPU *cpu, X86CPUDefinition *def, Error **errp) return 0; } -X86CPU *cpu_x86_init(const char *cpu_model) +X86CPU *cpu_x86_init(const char *cpu_string) { X86CPU *cpu; CPUX86State *env; @@ -1530,11 +1530,11 @@ X86CPU *cpu_x86_init(const char *cpu_model) cpu = X86_CPU(object_new(TYPE_X86_CPU)); env = &cpu->env; - env->cpu_model_str = cpu_model; + env->cpu_model_str = cpu_string; memset(def, 0, sizeof(*def)); - if (cpu_x86_find_by_name(def, cpu_model, &error) < 0) { + if (cpu_x86_find_by_name(def, cpu_string, &error) < 0) { goto error; } -- 1.7.11.7