This is in preparation for its use within a QOM type presenting a single emulated 8259 PIC.
Signed-off-by: Mark Cave-Ayland <[email protected]> --- hw/intc/i8259.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index 547e86c5f4..856075a754 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -35,15 +35,15 @@ /*#define DEBUG_IRQ_LATENCY*/ #define TYPE_I8259 "isa-i8259" -typedef struct PICClass PICClass; -DECLARE_CLASS_CHECKERS(PICClass, PIC, +typedef struct I8259Class I8259Class; +DECLARE_CLASS_CHECKERS(I8259Class, I8259, TYPE_I8259) /** - * PICClass: + * I8259Class: * @parent_realize: The parent's realizefn. */ -struct PICClass { +struct I8259Class { I8259CommonClass parent_class; DeviceRealize parent_realize; @@ -388,7 +388,7 @@ static const MemoryRegionOps pic_elcr_ioport_ops = { static void pic_realize(DeviceState *dev, Error **errp) { I8259CommonState *s = I8259_COMMON(dev); - PICClass *pc = PIC_GET_CLASS(dev); + I8259Class *k = I8259_GET_CLASS(dev); memory_region_init_io(&s->base_io, OBJECT(s), &pic_base_ioport_ops, s, "pic", 2); @@ -398,7 +398,7 @@ static void pic_realize(DeviceState *dev, Error **errp) qdev_init_gpio_out(dev, s->int_out, ARRAY_SIZE(s->int_out)); qdev_init_gpio_in(dev, pic_set_irq, 8); - pc->parent_realize(dev, errp); + k->parent_realize(dev, errp); } qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq_in) @@ -435,7 +435,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq_in) static void i8259_class_init(ObjectClass *klass, const void *data) { - PICClass *k = PIC_CLASS(klass); + I8259Class *k = I8259_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); device_class_set_parent_realize(dc, pic_realize, &k->parent_realize); @@ -447,7 +447,7 @@ static const TypeInfo i8259_info = { .instance_size = sizeof(I8259CommonState), .parent = TYPE_I8259_COMMON, .class_init = i8259_class_init, - .class_size = sizeof(PICClass), + .class_size = sizeof(I8259Class), }; static void pic_register_types(void) -- 2.43.0
