From patchwork Mon May 23 15:09:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9132069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4918A607D3 for ; Mon, 23 May 2016 15:39:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CBD428219 for ; Mon, 23 May 2016 15:39:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3194228239; Mon, 23 May 2016 15:39:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D0C2F28219 for ; Mon, 23 May 2016 15:39:46 +0000 (UTC) Received: from localhost ([::1]:48968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rxH-00031M-Rd for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 May 2016 11:39:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rV2-0002RC-BB for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4rUv-00049h-6X for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:31 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4rUu-00049F-Hr for qemu-devel@nongnu.org; Mon, 23 May 2016 11:10:25 -0400 Received: by mail-wm0-x244.google.com with SMTP id q62so16006540wmg.3 for ; Mon, 23 May 2016 08:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=N7VFft3JYpbTcZKQCFF3amaucYh+ci6M7QVAdqdoTDc=; b=qlos6xD4af8XUem99utLcaiE6ChrFdRt3IEufG8w5+OMKC6wENFRCAycNqus9Hk3Xt 4rWnPNjLzDek6HX4UFiGy9gYZnqeOxg3JEEh9edcvVJu039+44YA80YSw6+rKh+NDMRc 2oVNCeyjK8e1hvNvYiolE/guzNu/MCM/BVZaue5UsWSylv87fZ8iPOPFTU+cgsyoS8KN So8SQ/6KJGN8DyjXt6oioTSuzDC/0qpil8gDDP2QHqR0Y7uVG1hOke3xyfHAhv452ZB2 7c7/zzXcHIvz98WKsZ7+3aiQg86Rjj+/0vB3sUBSiBXjPmW8xWQreqZFxmut0bjIzktu sYKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=N7VFft3JYpbTcZKQCFF3amaucYh+ci6M7QVAdqdoTDc=; b=Xs4yzYY8aigZk0O6KwOvdJpnNSe4ncRmezYP5PQ6UZOz6i1JRGiM/lpiHc8YQQ4Q2r 0kpQsJSaSYBF4lBtURRs9azhefik/E0PkmEpee9kV1OeuOoBBEFN2xD4Hoe2bLKGTMPV staNzyyWGpNZMMgz9dS4gYct+dgJbBt/EbBeSAN1cUylDjNVnbv3jDIwTJolCYG5pNv5 VaFRoOMUjrC/QysGDgikNe3uSd3jXumPq2tTJX5ZKvexunA0qPYdYvDKqTqnCNK11DU0 kCavlF9ejKOPuzn+2l8gZ4QvstO+A283x8YLyPuTQvL8EIVGxJ0ZOtaKtPhav0t+SnSO nwUw== X-Gm-Message-State: AOPr4FUvicgUy3mUiYUq6Gw21EDWIXY73WjKyXgvKbBL1VjPbyBQxRwnw7JzNdvXrrPVAw== X-Received: by 10.194.133.98 with SMTP id pb2mr16993862wjb.144.1464016224033; Mon, 23 May 2016 08:10:24 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id ac2sm19250359wjc.35.2016.05.23.08.10.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2016 08:10:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 23 May 2016 17:09:57 +0200 Message-Id: <1464016199-43768-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1464016199-43768-1-git-send-email-pbonzini@redhat.com> References: <1464016199-43768-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 22/24] target-i386: add a generic x86 nmi handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bandan Das Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Bandan Das Instead of having x86 ifdefs in core nmi code, this change adds a arch specific handler that the nmi common code can call. Signed-off-by: Bandan Das Message-Id: <1463761717-26558-2-git-send-email-bsd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 99437e0..e29ccc8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -67,6 +67,7 @@ #include "qapi/visitor.h" #include "qapi-visit.h" #include "qom/cpu.h" +#include "hw/nmi.h" /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1963,11 +1964,28 @@ static CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *machine) return list; } +static void x86_nmi(NMIState *n, int cpu_index, Error **errp) +{ + /* cpu index isn't used */ + 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); + } + } +} + static void pc_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); PCMachineClass *pcmc = PC_MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); + NMIClass *nc = NMI_CLASS(oc); pcmc->get_hotplug_handler = mc->get_hotplug_handler; pcmc->pci_enabled = true; @@ -1993,6 +2011,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) hc->plug = pc_machine_device_plug_cb; hc->unplug_request = pc_machine_device_unplug_request_cb; hc->unplug = pc_machine_device_unplug_cb; + nc->nmi_monitor_handler = x86_nmi; } static const TypeInfo pc_machine_info = { @@ -2005,6 +2024,7 @@ static const TypeInfo pc_machine_info = { .class_init = pc_machine_class_init, .interfaces = (InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, + { TYPE_NMI }, { } }, };