From patchwork Sun Sep 25 18:36:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 674665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3shwv268sVz9s5g for ; Mon, 26 Sep 2016 04:42:22 +1000 (AEST) Received: from localhost ([::1]:39989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boENY-000400-Dz for incoming@patchwork.ozlabs.org; Sun, 25 Sep 2016 14:42:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boEID-00077c-Gk for qemu-devel@nongnu.org; Sun, 25 Sep 2016 14:36:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1boEIA-0006A0-Do for qemu-devel@nongnu.org; Sun, 25 Sep 2016 14:36:49 -0400 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]:46501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boEIA-00062C-1i for qemu-devel@nongnu.org; Sun, 25 Sep 2016 14:36:46 -0400 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id 68115200371; Sun, 25 Sep 2016 20:36:20 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 25 Sep 2016 20:36:07 +0200 Message-Id: <1474828572-25187-2-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1474828572-25187-1-git-send-email-hpoussin@reactos.org> References: <1474828572-25187-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 2a01:e0c:1:1599::11 Subject: [Qemu-devel] [PATCH 1/6] intc: add an interface to gather statistics/informations on interrupt controllers 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: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Luiz Capitulino Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This interface will be used by HMP commands 'info irq' and 'info pic'. Signed-off-by: Hervé Poussineau --- hw/intc/Makefile.objs | 1 + hw/intc/intc.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/hw/intc/intc.h | 27 +++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 hw/intc/intc.c create mode 100644 include/hw/intc/intc.h diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 05ec21b..f24c837 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -17,6 +17,7 @@ common-obj-$(CONFIG_ARM_GIC) += arm_gicv3.o common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_dist.o common-obj-$(CONFIG_ARM_GIC) += arm_gicv3_redist.o common-obj-$(CONFIG_OPENPIC) += openpic.o +common-obj-y += intc.o obj-$(CONFIG_APIC) += apic.o apic_common.o obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o diff --git a/hw/intc/intc.c b/hw/intc/intc.c new file mode 100644 index 0000000..1ac0585 --- /dev/null +++ b/hw/intc/intc.c @@ -0,0 +1,41 @@ +/* + * QEMU Generic Interrupt Controller + * + * Copyright (c) 2016 Hervé Poussineau + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/intc/intc.h" +#include "qemu/module.h" + +static const TypeInfo intctrl_info = { + .name = TYPE_INTCTRL, + .parent = TYPE_INTERFACE, + .class_size = sizeof(IntCtrlClass), +}; + +static void intc_register_types(void) +{ + type_register_static(&intctrl_info); +} + +type_init(intc_register_types) + diff --git a/include/hw/intc/intc.h b/include/hw/intc/intc.h new file mode 100644 index 0000000..7602bf9 --- /dev/null +++ b/include/hw/intc/intc.h @@ -0,0 +1,27 @@ +#ifndef INTC_H +#define INTC_H + +#include "qom/object.h" + +#define TYPE_INTCTRL "intctrl" + +#define INTCTRL_CLASS(klass) \ + OBJECT_CLASS_CHECK(IntCtrlClass, (klass), TYPE_INTCTRL) +#define INTCTRL_GET_CLASS(obj) \ + OBJECT_GET_CLASS(IntCtrlClass, (obj), TYPE_INTCTRL) +#define INTCTRL(obj) \ + INTERFACE_CHECK(IntCtrl, (obj), TYPE_INTCTRL) + +typedef struct IntCtrl { + Object parent; +} IntCtrl; + +typedef struct IntCtrlClass { + InterfaceClass parent; + + bool (*get_statistics)(IntCtrl *obj, uint64_t **irq_counts, + unsigned int *nb_irqs); + void (*print_info)(IntCtrl *obj, Monitor *mon); +} IntCtrlClass; + +#endif