From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YliMq-0001ih-R8 for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YliMp-0006i8-HR for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YliMp-0006i4-CW for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:23 -0400 From: Eduardo Habkost Date: Fri, 24 Apr 2015 15:30:06 -0300 Message-Id: <1429900209-31811-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1429900209-31811-1-git-send-email-ehabkost@redhat.com> References: <1429900209-31811-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] target-i386: Use X86CPU on cpu_x86_version() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini Signed-off-by: Eduardo Habkost --- target-i386/helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 166a803..215b354 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -25,9 +25,9 @@ #include "monitor/monitor.h" #endif -static void cpu_x86_version(CPUX86State *env, int *family, int *model) +static void cpu_x86_version(X86CPU *cpu, int *family, int *model) { - int cpuver = env->cpuid_version; + int cpuver = cpu->env.cpuid_version; if (family == NULL || model == NULL) { return; @@ -43,7 +43,7 @@ int cpu_x86_support_mca_broadcast(X86CPU *cpu) int family = 0; int model = 0; - cpu_x86_version(&cpu->env, &family, &model); + cpu_x86_version(cpu, &family, &model); if ((family == 6 && model >= 14) || family > 6) { return 1; } -- 2.1.0