From patchwork Fri Apr 24 18:30:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 464363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 89B5714011B for ; Sat, 25 Apr 2015 04:31:11 +1000 (AEST) Received: from localhost ([::1]:45928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YliNY-0002Xj-1U for incoming@patchwork.ozlabs.org; Fri, 24 Apr 2015 14:31:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YliMq-0001if-Qm 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 1YliMn-0006hf-Jf for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YliMn-0006hZ-Dw for qemu-devel@nongnu.org; Fri, 24 Apr 2015 14:30:21 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E6E44B5938; Fri, 24 Apr 2015 18:30:20 +0000 (UTC) Received: from localhost (ovpn-113-180.phx2.redhat.com [10.3.113.180]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3OIUJPm031589; Fri, 24 Apr 2015 14:30:20 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 24 Apr 2015 15:30:05 -0300 Message-Id: <1429900209-31811-2-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini Subject: [Qemu-devel] [PATCH 1/5] target-i386: Use X86CPU on cpu_x86_support_mca_broadcast() 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 Signed-off-by: Eduardo Habkost --- target-i386/cpu.h | 2 +- target-i386/helper.c | 6 +++--- target-i386/kvm.c | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 4ee12ca..5f4dab1 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -984,7 +984,7 @@ X86CPU *cpu_x86_create(const char *cpu_model, Error **errp); int cpu_x86_exec(CPUX86State *s); void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf); void x86_cpudef_setup(void); -int cpu_x86_support_mca_broadcast(CPUX86State *env); +int cpu_x86_support_mca_broadcast(X86CPU *cpu); int cpu_get_pic_interrupt(CPUX86State *s); /* MSDOS compatibility mode FPU exception support */ diff --git a/target-i386/helper.c b/target-i386/helper.c index 4f1ddf7..166a803 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -38,12 +38,12 @@ static void cpu_x86_version(CPUX86State *env, int *family, int *model) } /* Broadcast MCA signal for processor version 06H_EH and above */ -int cpu_x86_support_mca_broadcast(CPUX86State *env) +int cpu_x86_support_mca_broadcast(X86CPU *cpu) { int family = 0; int model = 0; - cpu_x86_version(env, &family, &model); + cpu_x86_version(&cpu->env, &family, &model); if ((family == 6 && model >= 14) || family > 6) { return 1; } @@ -1148,7 +1148,7 @@ void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, return; } if ((flags & MCE_INJECT_BROADCAST) - && !cpu_x86_support_mca_broadcast(cenv)) { + && !cpu_x86_support_mca_broadcast(cpu)) { monitor_printf(mon, "Guest CPU does not support MCA broadcast\n"); return; } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 41d09e5..bb2477d 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -298,7 +298,6 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code) { - CPUX86State *env = &cpu->env; uint64_t status = MCI_STATUS_VAL | MCI_STATUS_UC | MCI_STATUS_EN | MCI_STATUS_MISCV | MCI_STATUS_ADDRV | MCI_STATUS_S; uint64_t mcg_status = MCG_STATUS_MCIP; @@ -312,7 +311,7 @@ static void kvm_mce_inject(X86CPU *cpu, hwaddr paddr, int code) } cpu_x86_inject_mce(NULL, cpu, 9, status, mcg_status, paddr, (MCM_ADDR_PHYS << 6) | 0xc, - cpu_x86_support_mca_broadcast(env) ? + cpu_x86_support_mca_broadcast(cpu) ? MCE_INJECT_BROADCAST : 0); }