From patchwork Mon Nov 12 21:38:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [14/17] target-i386: cpu_x86_init(): rename cpu_model to cpu_string From: Eduardo Habkost X-Patchwork-Id: 198476 Message-Id: <1352756342-13716-15-git-send-email-ehabkost@redhat.com> To: qemu-devel@nongnu.org, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Don Slutz Date: Mon, 12 Nov 2012 19:38:59 -0200 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 --- 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; }