This is to emphasise that child types of PIC_COMMON are all instances of an an 8259 PIC.
Signed-off-by: Mark Cave-Ayland <[email protected]> Reviewed-by: Peter Maydell <[email protected]> --- include/hw/isa/i8259_internal.h | 4 ++-- hw/i386/kvm/i8259.c | 8 ++++---- hw/intc/i8259.c | 10 +++++----- hw/intc/i8259_common.c | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h index f9dcc4163e..54dc9036cf 100644 --- a/include/hw/isa/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h @@ -31,8 +31,8 @@ #include "qom/object.h" -#define TYPE_PIC_COMMON "pic-common" -OBJECT_DECLARE_TYPE(PICCommonState, PICCommonClass, PIC_COMMON) +#define TYPE_I8259_COMMON "pic-common" +OBJECT_DECLARE_TYPE(PICCommonState, PICCommonClass, I8259_COMMON) struct PICCommonClass { DeviceClass parent_class; diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 66f37e1303..14029783e5 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -103,7 +103,7 @@ static void kvm_pic_put(PICCommonState *s) static void kvm_pic_reset(DeviceState *dev) { - PICCommonState *s = PIC_COMMON(dev); + PICCommonState *s = I8259_COMMON(dev); s->elcr = 0; pic_reset_common(s); @@ -122,7 +122,7 @@ static void kvm_pic_set_irq(void *opaque, int irq, int level) static void kvm_pic_realize(DeviceState *dev, Error **errp) { - PICCommonState *s = PIC_COMMON(dev); + PICCommonState *s = I8259_COMMON(dev); KVMPICClass *kpc = KVM_PIC_GET_CLASS(dev); memory_region_init_io(&s->base_io, OBJECT(dev), NULL, NULL, "kvm-pic", 2); @@ -142,7 +142,7 @@ qemu_irq *kvm_i8259_init(ISABus *bus) static void kvm_i8259_class_init(ObjectClass *klass, const void *data) { KVMPICClass *kpc = KVM_PIC_CLASS(klass); - PICCommonClass *k = PIC_COMMON_CLASS(klass); + PICCommonClass *k = I8259_COMMON_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); device_class_set_legacy_reset(dc, kvm_pic_reset); @@ -153,7 +153,7 @@ static void kvm_i8259_class_init(ObjectClass *klass, const void *data) static const TypeInfo kvm_i8259_info = { .name = TYPE_KVM_I8259, - .parent = TYPE_PIC_COMMON, + .parent = TYPE_I8259_COMMON, .instance_size = sizeof(PICCommonState), .class_init = kvm_i8259_class_init, .class_size = sizeof(KVMPICClass), diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index 8f2aa1f0fb..52e24d333e 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -218,7 +218,7 @@ static void pic_init_reset(PICCommonState *s) static void pic_reset(DeviceState *dev) { - PICCommonState *s = PIC_COMMON(dev); + PICCommonState *s = I8259_COMMON(dev); s->elcr = 0; s->ltim = 0; @@ -387,7 +387,7 @@ static const MemoryRegionOps pic_elcr_ioport_ops = { static void pic_realize(DeviceState *dev, Error **errp) { - PICCommonState *s = PIC_COMMON(dev); + PICCommonState *s = I8259_COMMON(dev); PICClass *pc = PIC_GET_CLASS(dev); memory_region_init_io(&s->base_io, OBJECT(s), &pic_base_ioport_ops, s, @@ -418,7 +418,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq_in) irq_set[i] = qdev_get_gpio_in(dev, i); } - isa_pic = PIC_COMMON(dev); + isa_pic = I8259_COMMON(dev); isadev = i8259_init_chip(TYPE_I8259, bus, false); dev = DEVICE(isadev); @@ -428,7 +428,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq_in) irq_set[i + 8] = qdev_get_gpio_in(dev, i); } - slave_pic = PIC_COMMON(dev); + slave_pic = I8259_COMMON(dev); return irq_set; } @@ -445,7 +445,7 @@ static void i8259_class_init(ObjectClass *klass, const void *data) static const TypeInfo i8259_info = { .name = TYPE_I8259, .instance_size = sizeof(PICCommonState), - .parent = TYPE_PIC_COMMON, + .parent = TYPE_I8259_COMMON, .class_init = i8259_class_init, .class_size = sizeof(PICClass), }; diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index 8ceb5841b9..e2f997e161 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -56,7 +56,7 @@ void pic_reset_common(PICCommonState *s) static int pic_dispatch_pre_save(void *opaque) { PICCommonState *s = opaque; - PICCommonClass *info = PIC_COMMON_GET_CLASS(s); + PICCommonClass *info = I8259_COMMON_GET_CLASS(s); if (info->pre_save) { info->pre_save(s); @@ -68,7 +68,7 @@ static int pic_dispatch_pre_save(void *opaque) static int pic_dispatch_post_load(void *opaque, int version_id) { PICCommonState *s = opaque; - PICCommonClass *info = PIC_COMMON_GET_CLASS(s); + PICCommonClass *info = I8259_COMMON_GET_CLASS(s); if (info->post_load) { info->post_load(s); @@ -78,7 +78,7 @@ static int pic_dispatch_post_load(void *opaque, int version_id) static void pic_common_realize(DeviceState *dev, Error **errp) { - PICCommonState *s = PIC_COMMON(dev); + PICCommonState *s = I8259_COMMON(dev); ISADevice *isa = ISA_DEVICE(dev); isa_register_ioport(isa, &s->base_io, s->iobase); @@ -118,7 +118,7 @@ void pic_stat_update_irq(int irq, int level) static bool pic_get_statistics(InterruptStatsProvider *obj, uint64_t **irq_counts, unsigned int *nb_irqs) { - PICCommonState *s = PIC_COMMON(obj); + PICCommonState *s = I8259_COMMON(obj); if (s->master) { *irq_counts = irq_count; @@ -133,7 +133,7 @@ static bool pic_get_statistics(InterruptStatsProvider *obj, static void pic_print_info(InterruptStatsProvider *obj, GString *buf) { - PICCommonState *s = PIC_COMMON(obj); + PICCommonState *s = I8259_COMMON(obj); pic_dispatch_pre_save(s); g_string_append_printf(buf, "pic%d: irr=%02x imr=%02x isr=%02x hprio=%d " @@ -146,7 +146,7 @@ static void pic_print_info(InterruptStatsProvider *obj, GString *buf) static bool ltim_state_needed(void *opaque) { - PICCommonState *s = PIC_COMMON(opaque); + PICCommonState *s = I8259_COMMON(opaque); return !!s->ltim; } @@ -220,7 +220,7 @@ static void pic_common_class_init(ObjectClass *klass, const void *data) } static const TypeInfo pic_common_type = { - .name = TYPE_PIC_COMMON, + .name = TYPE_I8259_COMMON, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(PICCommonState), .class_size = sizeof(PICCommonClass), -- 2.43.0
