From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3WEK-0001bm-AB for qemu-devel@nongnu.org; Thu, 19 May 2016 18:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3WEJ-0007Fr-9m for qemu-devel@nongnu.org; Thu, 19 May 2016 18:15:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3WEJ-0007Ff-3v for qemu-devel@nongnu.org; Thu, 19 May 2016 18:15:43 -0400 From: Bandan Das Date: Thu, 19 May 2016 18:15:14 -0400 Message-Id: <1463696116-31631-3-git-send-email-bsd@redhat.com> In-Reply-To: <1463696116-31631-1-git-send-email-bsd@redhat.com> References: <1463696116-31631-1-git-send-email-bsd@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] nmi: remove x86 specific nmi handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, aik@ozlabs.ru nmi_monitor_handle is wired to call the x86 nmi handler now. So, we can call it here. Note that this also reverts changes made by commit 33c11879 Signed-off-by: Bandan Das --- hw/core/nmi.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hw/core/nmi.c b/hw/core/nmi.c index f616a79..cc47025 100644 --- a/hw/core/nmi.c +++ b/hw/core/nmi.c @@ -20,16 +20,11 @@ */ #include "qemu/osdep.h" -#include "qom/cpu.h" #include "hw/nmi.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "monitor/monitor.h" -#if defined(TARGET_I386) -#include "cpu.h" -#endif - struct do_nmi_s { int cpu_index; Error *err; @@ -80,21 +75,7 @@ void nmi_monitor_handle(int cpu_index, Error **errp) void inject_nmi(void) { -#if defined(TARGET_I386) - CPUState *cs; - - CPU_FOREACH(cs) { - X86CPU *cpu = X86_CPU(cs); - - if (!cpu->apic_state) { - cpu_interrupt(cs, CPU_INTERRUPT_NMI); - } else { - apic_deliver_nmi(cpu->apic_state); - } - } -#else nmi_monitor_handle(0, NULL); -#endif } static const TypeInfo nmi_info = { -- 2.5.5