[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] intc/i8259: implement IntCtrl interface
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 2/6] intc/i8259: implement IntCtrl interface |
Date: |
Sun, 25 Sep 2016 20:36:08 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/intc/i8259.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index c2607a5..c778b5d 100644
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -29,6 +29,7 @@
#include "qemu/timer.h"
#include "qemu/log.h"
#include "hw/isa/i8259_internal.h"
+#include "hw/intc/intc.h"
/* debug PIC */
//#define DEBUG_PIC
@@ -251,6 +252,35 @@ static void pic_reset(DeviceState *dev)
pic_init_reset(s);
}
+static bool pic_get_statistics(IntCtrl *obj, uint64_t **irq_counts,
+ unsigned int *nb_irqs)
+{
+ PICCommonState *s = PIC_COMMON(obj);
+
+ if (s->master) {
+#ifdef DEBUG_IRQ_COUNT
+ *irq_counts = irq_count;
+ *nb_irqs = ARRAY_SIZE(irq_count);
+#else
+ return false;
+#endif
+ } else {
+ *irq_counts = NULL;
+ *nb_irqs = 0;
+ }
+ return true;
+}
+
+static void pic_print_info(IntCtrl *obj, Monitor *mon)
+{
+ PICCommonState *s = PIC_COMMON(obj);
+ monitor_printf(mon, "pic%d: irr=%02x imr=%02x isr=%02x hprio=%d "
+ "irq_base=%02x rr_sel=%d elcr=%02x fnm=%d\n",
+ s->master ? 0 : 1, s->irr, s->imr, s->isr, s->priority_add,
+ s->irq_base, s->read_reg_select, s->elcr,
+ s->special_fully_nested_mode);
+}
+
static void pic_ioport_write(void *opaque, hwaddr addr64,
uint64_t val64, unsigned size)
{
@@ -503,10 +533,13 @@ static void i8259_class_init(ObjectClass *klass, void
*data)
{
PICClass *k = PIC_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
+ IntCtrlClass *ic = INTCTRL_CLASS(klass);
k->parent_realize = dc->realize;
dc->realize = pic_realize;
dc->reset = pic_reset;
+ ic->get_statistics = pic_get_statistics;
+ ic->print_info = pic_print_info;
}
static const TypeInfo i8259_info = {
@@ -515,6 +548,10 @@ static const TypeInfo i8259_info = {
.parent = TYPE_PIC_COMMON,
.class_init = i8259_class_init,
.class_size = sizeof(PICClass),
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_INTCTRL },
+ { }
+ },
};
static void pic_register_types(void)
--
2.1.4
- [Qemu-devel] [PATCH 0/6] intc: change 'info irq' and 'info pic' to be target-agnostic, Hervé Poussineau, 2016/09/25
- [Qemu-devel] [PATCH 1/6] intc: add an interface to gather statistics/informations on interrupt controllers, Hervé Poussineau, 2016/09/25
- [Qemu-devel] [PATCH 6/6] intc: make HMP 'info irq' and 'info pic' commands available on all targets, Hervé Poussineau, 2016/09/25
- [Qemu-devel] [PATCH 4/6] intc/lm32_pic: implement IntCtrl interface, Hervé Poussineau, 2016/09/25
- [Qemu-devel] [PATCH 2/6] intc/i8259: implement IntCtrl interface,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 5/6] intc: make HMP 'info irq' and 'info pic' commands use IntCtrl interface instead of ad-hock code, Hervé Poussineau, 2016/09/25
- [Qemu-devel] [PATCH 3/6] intc/slavio_intctl: implement IntCtrl interface, Hervé Poussineau, 2016/09/25
- Re: [Qemu-devel] [PATCH 0/6] intc: change 'info irq' and 'info pic' to be target-agnostic, Paolo Bonzini, 2016/09/26