From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1ww-00014G-QF for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1ws-0005oO-RZ for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35631 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1ws-0005n0-8l for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:18 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:08:07 +0200 Message-Id: <1337742502-28565-45-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 44/59] target-i386: Pass X86CPU to kvm_mce_inject() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:X86" , Avi Kivity Needed for cpu_x86_inject_mce(). Signed-off-by: Andreas F=C3=A4rber --- target-i386/kvm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 92ad338..758bf8f 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -221,8 +221,9 @@ static int kvm_get_mce_cap_supported(KVMState *s, uin= t64_t *mce_cap, return -ENOSYS; } =20 -static void kvm_mce_inject(CPUX86State *env, target_phys_addr_t paddr, i= nt code) +static void kvm_mce_inject(X86CPU *cpu, target_phys_addr_t paddr, int co= de) { + CPUX86State *env =3D &cpu->env; uint64_t status =3D MCI_STATUS_VAL | MCI_STATUS_UC | MCI_STATUS_EN | MCI_STATUS_MISCV | MCI_STATUS_ADDRV | MCI_STATUS_S= ; uint64_t mcg_status =3D MCG_STATUS_MCIP; @@ -248,6 +249,7 @@ static void hardware_memory_error(void) =20 int kvm_arch_on_sigbus_vcpu(CPUX86State *env, int code, void *addr) { + X86CPU *cpu =3D x86_env_get_cpu(env); ram_addr_t ram_addr; target_phys_addr_t paddr; =20 @@ -265,7 +267,7 @@ int kvm_arch_on_sigbus_vcpu(CPUX86State *env, int cod= e, void *addr) } } kvm_hwpoison_page_add(ram_addr); - kvm_mce_inject(env, paddr, code); + kvm_mce_inject(cpu, paddr, code); } else { if (code =3D=3D BUS_MCEERR_AO) { return 0; @@ -293,7 +295,7 @@ int kvm_arch_on_sigbus(int code, void *addr) return 0; } kvm_hwpoison_page_add(ram_addr); - kvm_mce_inject(first_cpu, paddr, code); + kvm_mce_inject(x86_env_get_cpu(first_cpu), paddr, code); } else { if (code =3D=3D BUS_MCEERR_AO) { return 0; --=20 1.7.7