From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1hg-0004Ia-TX for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:38:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TY1hd-0004gP-Qt for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:38:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1hd-0004fs-IE for qemu-devel@nongnu.org; Mon, 12 Nov 2012 16:37:57 -0500 From: Eduardo Habkost Date: Mon, 12 Nov 2012 19:38:59 -0200 Message-Id: <1352756342-13716-15-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352756342-13716-1-git-send-email-ehabkost@redhat.com> References: <1352756342-13716-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 14/17] target-i386: cpu_x86_init(): rename cpu_model to cpu_string List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Cc: Don Slutz 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; } -- 1.7.11.7