From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH qom-next 45/59] target-i386: Pass X86CPU to cpu_x86_inject_mce() Date: Wed, 23 May 2012 05:08:08 +0200 Message-ID: <1337742502-28565-46-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Luiz Capitulino (supporter:Monitor (QMP/HMP)), Markus Armbruster (supporter:Monitor (QMP/HMP)), Avi Kivity (supporter:X86), Marcelo Tosatti (supporter:X86), kvm@vger.kernel.org (open list:X86) To: qemu-devel@nongnu.org Return-path: Received: from cantor2.suse.de ([195.135.220.15]:35636 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965007Ab2EWDJS (ORCPT ); Tue, 22 May 2012 23:09:18 -0400 In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> Sender: kvm-owner@vger.kernel.org List-ID: Needed for run_on_cpu(). Signed-off-by: Andreas F=C3=A4rber --- monitor.c | 6 ++++-- target-i386/cpu.h | 2 +- target-i386/helper.c | 3 ++- target-i386/kvm.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 12a6fe2..07d24f8 100644 --- a/monitor.c +++ b/monitor.c @@ -2177,7 +2177,8 @@ static void do_acl_remove(Monitor *mon, const QDi= ct *qdict) #if defined(TARGET_I386) static void do_inject_mce(Monitor *mon, const QDict *qdict) { - CPUArchState *cenv; + X86CPU *cpu; + CPUX86State *cenv; int cpu_index =3D qdict_get_int(qdict, "cpu_index"); int bank =3D qdict_get_int(qdict, "bank"); uint64_t status =3D qdict_get_int(qdict, "status"); @@ -2190,8 +2191,9 @@ static void do_inject_mce(Monitor *mon, const QDi= ct *qdict) flags |=3D MCE_INJECT_BROADCAST; } for (cenv =3D first_cpu; cenv !=3D NULL; cenv =3D cenv->next_cpu) = { + cpu =3D x86_env_get_cpu(cenv); if (cenv->cpu_index =3D=3D cpu_index) { - cpu_x86_inject_mce(mon, cenv, bank, status, mcg_status, ad= dr, misc, + cpu_x86_inject_mce(mon, cpu, bank, status, mcg_status, add= r, misc, flags); break; } diff --git a/target-i386/cpu.h b/target-i386/cpu.h index bbe8de4..5169bb0 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1067,7 +1067,7 @@ void do_cpu_sipi(X86CPU *cpu); #define MCE_INJECT_BROADCAST 1 #define MCE_INJECT_UNCOND_AO 2 =20 -void cpu_x86_inject_mce(Monitor *mon, CPUX86State *cenv, int bank, +void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, uint64_t status, uint64_t mcg_status, uint64_t= addr, uint64_t misc, int flags); =20 diff --git a/target-i386/helper.c b/target-i386/helper.c index 018a98f..bfd314b 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1053,10 +1053,11 @@ static void do_inject_x86_mce(void *data) } } =20 -void cpu_x86_inject_mce(Monitor *mon, CPUX86State *cenv, int bank, +void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, uint64_t status, uint64_t mcg_status, uint64_t= addr, uint64_t misc, int flags) { + CPUX86State *cenv =3D &cpu->env; MCEInjectionParams params =3D { .mon =3D mon, .env =3D cenv, diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 758bf8f..f611a96 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -235,7 +235,7 @@ static void kvm_mce_inject(X86CPU *cpu, target_phys= _addr_t paddr, int code) status |=3D 0xc0; mcg_status |=3D MCG_STATUS_RIPV; } - cpu_x86_inject_mce(NULL, env, 9, status, mcg_status, paddr, + cpu_x86_inject_mce(NULL, cpu, 9, status, mcg_status, paddr, (MCM_ADDR_PHYS << 6) | 0xc, cpu_x86_support_mca_broadcast(env) ? MCE_INJECT_BROADCAST : 0); --=20 1.7.7 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wy-00018a-8h for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wt-0005ox-9W for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35635 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wt-0005nY-04 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:19 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:08:08 +0200 Message-Id: <1337742502-28565-46-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 45/59] target-i386: Pass X86CPU to cpu_x86_inject_mce() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "open list:X86" , Marcelo Tosatti , Markus Armbruster , Luiz Capitulino , Avi Kivity , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for run_on_cpu(). Signed-off-by: Andreas F=C3=A4rber --- monitor.c | 6 ++++-- target-i386/cpu.h | 2 +- target-i386/helper.c | 3 ++- target-i386/kvm.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 12a6fe2..07d24f8 100644 --- a/monitor.c +++ b/monitor.c @@ -2177,7 +2177,8 @@ static void do_acl_remove(Monitor *mon, const QDict= *qdict) #if defined(TARGET_I386) static void do_inject_mce(Monitor *mon, const QDict *qdict) { - CPUArchState *cenv; + X86CPU *cpu; + CPUX86State *cenv; int cpu_index =3D qdict_get_int(qdict, "cpu_index"); int bank =3D qdict_get_int(qdict, "bank"); uint64_t status =3D qdict_get_int(qdict, "status"); @@ -2190,8 +2191,9 @@ static void do_inject_mce(Monitor *mon, const QDict= *qdict) flags |=3D MCE_INJECT_BROADCAST; } for (cenv =3D first_cpu; cenv !=3D NULL; cenv =3D cenv->next_cpu) { + cpu =3D x86_env_get_cpu(cenv); if (cenv->cpu_index =3D=3D cpu_index) { - cpu_x86_inject_mce(mon, cenv, bank, status, mcg_status, addr= , misc, + cpu_x86_inject_mce(mon, cpu, bank, status, mcg_status, addr,= misc, flags); break; } diff --git a/target-i386/cpu.h b/target-i386/cpu.h index bbe8de4..5169bb0 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1067,7 +1067,7 @@ void do_cpu_sipi(X86CPU *cpu); #define MCE_INJECT_BROADCAST 1 #define MCE_INJECT_UNCOND_AO 2 =20 -void cpu_x86_inject_mce(Monitor *mon, CPUX86State *cenv, int bank, +void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, uint64_t status, uint64_t mcg_status, uint64_t a= ddr, uint64_t misc, int flags); =20 diff --git a/target-i386/helper.c b/target-i386/helper.c index 018a98f..bfd314b 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1053,10 +1053,11 @@ static void do_inject_x86_mce(void *data) } } =20 -void cpu_x86_inject_mce(Monitor *mon, CPUX86State *cenv, int bank, +void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, uint64_t status, uint64_t mcg_status, uint64_t a= ddr, uint64_t misc, int flags) { + CPUX86State *cenv =3D &cpu->env; MCEInjectionParams params =3D { .mon =3D mon, .env =3D cenv, diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 758bf8f..f611a96 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -235,7 +235,7 @@ static void kvm_mce_inject(X86CPU *cpu, target_phys_a= ddr_t paddr, int code) status |=3D 0xc0; mcg_status |=3D MCG_STATUS_RIPV; } - cpu_x86_inject_mce(NULL, env, 9, status, mcg_status, paddr, + cpu_x86_inject_mce(NULL, cpu, 9, status, mcg_status, paddr, (MCM_ADDR_PHYS << 6) | 0xc, cpu_x86_support_mca_broadcast(env) ? MCE_INJECT_BROADCAST : 0); --=20 1.7.7