Commit 1b23190a authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

i8259: generalize statistics into common code 



It was only for userspace i8259.  Move it to general code so that
kvm-i8259 can also use it in the future.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20171210063819.14892-4-peterx@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f260f736

hw/intc/i8259.c

+1 −36
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ 
#include "hw/hw.h"

#include "hw/i386/pc.h"

#include "hw/isa/isa.h"

#include "monitor/monitor.h"

#include "qemu/timer.h"

#include "qemu/log.h"

#include "hw/isa/i8259_internal.h"

#include "hw/intc/intc.h"

#include "trace.h"



/* debug PIC */
@@ -51,8 +49,6 @@ typedef struct PICClass { 
    DeviceRealize parent_realize;

} PICClass;



static int irq_level[16];

static uint64_t irq_count[16];

#ifdef DEBUG_IRQ_LATENCY

static int64_t irq_time[16];

#endif
@@ -126,13 +122,7 @@ static void pic_set_irq(void *opaque, int irq, int level) 
    int irq_index = s->master ? irq : irq + 8;



    trace_pic_set_irq(s->master, irq, level);



    if (level != irq_level[irq_index]) {

        irq_level[irq_index] = level;

        if (level == 1) {

            irq_count[irq_index]++;

        }

    }

    pic_stat_update_irq(irq_index, level);



#ifdef DEBUG_IRQ_LATENCY

    if (level) {
@@ -235,31 +225,6 @@ static void pic_reset(DeviceState *dev) 
    pic_init_reset(s);

}



static bool pic_get_statistics(InterruptStatsProvider *obj,

                               uint64_t **irq_counts, unsigned int *nb_irqs)

{

    PICCommonState *s = PIC_COMMON(obj);



    if (s->master) {

        *irq_counts = irq_count;

        *nb_irqs = ARRAY_SIZE(irq_count);

    } else {

        *irq_counts = NULL;

        *nb_irqs = 0;

    }

    return true;

}



static void pic_print_info(InterruptStatsProvider *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)

{

hw/intc/i8259_common.c

+41 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ 
#include "qemu/osdep.h"

#include "hw/i386/pc.h"

#include "hw/isa/i8259_internal.h"

#include "monitor/monitor.h"



static int irq_level[16];

static uint64_t irq_count[16];



void pic_reset_common(PICCommonState *s)

{
@@ -98,6 +102,43 @@ ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master) 
    return isadev;

}



void pic_stat_update_irq(int irq, int level)

{

    if (level != irq_level[irq]) {

        irq_level[irq] = level;

        if (level == 1) {

            irq_count[irq]++;

        }

    }

}



bool pic_get_statistics(InterruptStatsProvider *obj,

                        uint64_t **irq_counts, unsigned int *nb_irqs)

{

    PICCommonState *s = PIC_COMMON(obj);



    if (s->master) {

        *irq_counts = irq_count;

        *nb_irqs = ARRAY_SIZE(irq_count);

    } else {

        *irq_counts = NULL;

        *nb_irqs = 0;

    }



    return true;

}



void pic_print_info(InterruptStatsProvider *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 const VMStateDescription vmstate_pic_common = {

    .name = "i8259",

    .version_id = 1,

include/hw/isa/i8259_internal.h

+5 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "hw/hw.h"

#include "hw/i386/pc.h"

#include "hw/isa/isa.h"

#include "hw/intc/intc.h"



typedef struct PICCommonState PICCommonState;
@@ -76,8 +77,10 @@ struct PICCommonState { 
};



void pic_reset_common(PICCommonState *s);



ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master);



void pic_stat_update_irq(int irq, int level);

bool pic_get_statistics(InterruptStatsProvider *obj,

                        uint64_t **irq_counts, unsigned int *nb_irqs);

void pic_print_info(InterruptStatsProvider *obj, Monitor *mon);



#endif /* QEMU_I8259_INTERNAL_H */