From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rV1-0002Qi-RV for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4rUw-0004AE-UE for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:30 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rUw-0004A2-NR for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:26 -0400 Received: by mail-wm0-x241.google.com with SMTP id n129so16053869wmn.1 for ; Mon, 23 May 2016 08:10:26 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 23 May 2016 17:09:59 +0200 Message-Id: <1464016199-43768-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1464016199-43768-1-git-send-email-pbonzini@redhat.com> References: <1464016199-43768-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 24/24] cpus: call the core nmi injection function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Bandan Das From: Bandan Das We can call the common function here directly since x86 specific actions will be taken care of by the arch specific nmi handler Signed-off-by: Bandan Das Message-Id: <1463761717-26558-4-git-send-email-bsd@redhat.com> Signed-off-by: Paolo Bonzini --- cpus.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cpus.c b/cpus.c index f8366c6..e75895a 100644 --- a/cpus.c +++ b/cpus.c @@ -1693,21 +1693,7 @@ exit: void qmp_inject_nmi(Error **errp) { -#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(monitor_get_cpu_index(), errp); -#endif } void dump_drift_info(FILE *f, fprintf_function cpu_fprintf) -- 1.8.3.1