[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [RFC PATCH 11/26] ppc/xics: introduce a print_info() handler
From: |
Cédric Le Goater |
Subject: |
[Qemu-ppc] [RFC PATCH 11/26] ppc/xics: introduce a print_info() handler to the ICS and ICP objects |
Date: |
Wed, 5 Jul 2017 19:13:24 +0200 |
This handler will be used to customize the ouput of the XIVE interrupt
source and presenter objects.
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/intc/xics.c | 36 ++++++++++++++++++++++++------------
include/hw/ppc/xics.h | 2 ++
2 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index faa5c631f655..7837c2022b4a 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -40,18 +40,26 @@
void icp_pic_print_info(ICPState *icp, Monitor *mon)
{
+ ICPStateClass *k = ICP_GET_CLASS(icp);
int cpu_index = icp->cs ? icp->cs->cpu_index : -1;
if (!icp->output) {
return;
}
- monitor_printf(mon, "CPU %d XIRR=%08x (%p) PP=%02x MFRR=%02x\n",
- cpu_index, icp->xirr, icp->xirr_owner,
- icp->pending_priority, icp->mfrr);
+
+ monitor_printf(mon, "CPU %d ", cpu_index);
+ if (k->print_info) {
+ k->print_info(icp, mon);
+ } else {
+ monitor_printf(mon, "XIRR=%08x (%p) PP=%02x MFRR=%02x\n",
+ icp->xirr, icp->xirr_owner,
+ icp->pending_priority, icp->mfrr);
+ }
}
void ics_pic_print_info(ICSState *ics, Monitor *mon)
{
+ ICSStateClass *k = ICS_BASE_GET_CLASS(ics);
uint32_t i;
monitor_printf(mon, "ICS %4x..%4x %p\n",
@@ -61,17 +69,21 @@ void ics_pic_print_info(ICSState *ics, Monitor *mon)
return;
}
- for (i = 0; i < ics->nr_irqs; i++) {
- ICSIRQState *irq = ics->irqs + i;
+ if (k->print_info) {
+ k->print_info(ics, mon);
+ } else {
+ for (i = 0; i < ics->nr_irqs; i++) {
+ ICSIRQState *irq = ics->irqs + i;
- if (!(irq->flags & XICS_FLAGS_IRQ_MASK)) {
- continue;
+ if (!(irq->flags & XICS_FLAGS_IRQ_MASK)) {
+ continue;
+ }
+ monitor_printf(mon, " %4x %s %02x %02x\n",
+ ics->offset + i,
+ (irq->flags & XICS_FLAGS_IRQ_LSI) ?
+ "LSI" : "MSI",
+ irq->priority, irq->status);
}
- monitor_printf(mon, " %4x %s %02x %02x\n",
- ics->offset + i,
- (irq->flags & XICS_FLAGS_IRQ_LSI) ?
- "LSI" : "MSI",
- irq->priority, irq->status);
}
}
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 28d248abad61..902f3bfd0e33 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -69,6 +69,7 @@ struct ICPStateClass {
void (*pre_save)(ICPState *icp);
int (*post_load)(ICPState *icp, int version_id);
void (*reset)(ICPState *icp);
+ void (*print_info)(ICPState *icp, Monitor *mon);
};
struct ICPState {
@@ -119,6 +120,7 @@ struct ICSStateClass {
void (*reject)(ICSState *s, uint32_t irq);
void (*resend)(ICSState *s);
void (*eoi)(ICSState *s, uint32_t irq);
+ void (*print_info)(ICSState *s, Monitor *mon);
};
struct ICSState {
--
2.7.5
[Qemu-ppc] [RFC PATCH 10/26] ppc/xive: record interrupt source MMIO address for hcalls, Cédric Le Goater, 2017/07/05
[Qemu-ppc] [RFC PATCH 11/26] ppc/xics: introduce a print_info() handler to the ICS and ICP objects,
Cédric Le Goater <=
[Qemu-ppc] [RFC PATCH 12/26] ppc/xive: add a print_info() handler for the interrupt source, Cédric Le Goater, 2017/07/05
[Qemu-ppc] [RFC PATCH 13/26] ppc/xive: introduce a XIVE interrupt presenter model, Cédric Le Goater, 2017/07/05
[Qemu-ppc] [RFC PATCH 14/26] ppc/xive: add MMIO handlers to the XIVE interrupt presenter model, Cédric Le Goater, 2017/07/05