On Fri, Dec 15, 2017 at 08:28:07AM -0300, Philippe Mathieu-Daudé wrote: [...]
> > diff --git a/include/hw/isa/i8259_internal.h > > b/include/hw/isa/i8259_internal.h > > index 6954b6ec5f..f742c2a726 100644 > > --- a/include/hw/isa/i8259_internal.h > > +++ b/include/hw/isa/i8259_internal.h > > @@ -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); > > can you rename pic -> i8259? > > i8259_get_statistics() or i8259pic_get_statistics() Yes I can. But AFAICT it does not really matter now since at least we are still mostly using pic_* in intc/i8259.c and kvm_pic_* in kvm/i8259.c for namings. So IMHO it's even more consistent to still use pci_* prefix for them. We can have another single patch to convert all of them to i8259 prefix if you wish to, as a work upon. Just let me know if you still insist. :-) Thanks for reviewing! -- Peter Xu