From patchwork Mon Nov 12 21:38:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 198476 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3495F2C007D for ; Tue, 13 Nov 2012 08:38:26 +1100 (EST) Received: from localhost ([::1]:52198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TY1i4-0004NC-65 for incoming@patchwork.ozlabs.org; Mon, 12 Nov 2012 16:38:24 -0500 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 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qACLbumW015582 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Nov 2012 16:37:56 -0500 Received: from blackpad.lan.raisama.net (vpn1-5-14.gru2.redhat.com [10.97.5.14]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qACLbtlg012700; Mon, 12 Nov 2012 16:37:56 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 6A84B203424; Mon, 12 Nov 2012 19:39:06 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org, Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Don Slutz Subject: [Qemu-devel] [PATCH 14/17] target-i386: cpu_x86_init(): rename cpu_model to cpu_string X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }