i8259_internal.h: rename PICCommonState to I8259CommonState Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-ID: <20261019120517.1448687-4-mark.caveayland@nutanix.com>
diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 1402978..f10643a 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c
@@ -34,7 +34,7 @@ DeviceRealize parent_realize; }; -static void kvm_pic_get(PICCommonState *s) +static void kvm_pic_get(I8259CommonState *s) { struct kvm_irqchip chip; struct kvm_pic_state *kpic; @@ -67,7 +67,7 @@ s->elcr_mask = kpic->elcr_mask; } -static void kvm_pic_put(PICCommonState *s) +static void kvm_pic_put(I8259CommonState *s) { struct kvm_irqchip chip; struct kvm_pic_state *kpic; @@ -103,7 +103,7 @@ static void kvm_pic_reset(DeviceState *dev) { - PICCommonState *s = I8259_COMMON(dev); + I8259CommonState *s = I8259_COMMON(dev); s->elcr = 0; pic_reset_common(s); @@ -122,7 +122,7 @@ static void kvm_pic_realize(DeviceState *dev, Error **errp) { - PICCommonState *s = I8259_COMMON(dev); + I8259CommonState *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); @@ -154,7 +154,7 @@ static const TypeInfo kvm_i8259_info = { .name = TYPE_KVM_I8259, .parent = TYPE_I8259_COMMON, - .instance_size = sizeof(PICCommonState), + .instance_size = sizeof(I8259CommonState), .class_init = kvm_i8259_class_init, .class_size = sizeof(KVMPICClass), };
diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index 52e24d3..45db87a 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c
@@ -52,12 +52,12 @@ #ifdef DEBUG_IRQ_LATENCY static int64_t irq_time[16]; #endif -PICCommonState *isa_pic; -static PICCommonState *slave_pic; +I8259CommonState *isa_pic; +static I8259CommonState *slave_pic; /* return the highest priority found in mask (highest = smallest number). Return 8 if no irq */ -static int get_priority(PICCommonState *s, int mask) +static int get_priority(I8259CommonState *s, int mask) { int priority; @@ -72,7 +72,7 @@ } /* return the pic wanted interrupt. return -1 if none */ -static int pic_get_irq(PICCommonState *s) +static int pic_get_irq(I8259CommonState *s) { int mask, cur_priority, priority; @@ -101,7 +101,7 @@ } /* Update INT output. Must be called every time the output may have changed. */ -static void pic_update_irq(PICCommonState *s) +static void pic_update_irq(I8259CommonState *s) { int irq; @@ -117,7 +117,7 @@ /* set irq level. If an edge is detected, then the IRR is set to 1 */ static void pic_set_irq(void *opaque, int irq, int level) { - PICCommonState *s = opaque; + I8259CommonState *s = opaque; int mask = 1 << irq; int irq_index = s->master ? irq : irq + 8; @@ -154,7 +154,7 @@ } /* acknowledge interrupt 'irq' */ -static void pic_intack(PICCommonState *s, int irq) +static void pic_intack(I8259CommonState *s, int irq) { if (s->auto_eoi) { if (s->rotate_on_auto_eoi) { @@ -170,7 +170,7 @@ pic_update_irq(s); } -int pic_read_irq(PICCommonState *s) +int pic_read_irq(I8259CommonState *s) { int irq, intno; @@ -210,7 +210,7 @@ return intno; } -static void pic_init_reset(PICCommonState *s) +static void pic_init_reset(I8259CommonState *s) { pic_reset_common(s); pic_update_irq(s); @@ -218,7 +218,7 @@ static void pic_reset(DeviceState *dev) { - PICCommonState *s = I8259_COMMON(dev); + I8259CommonState *s = I8259_COMMON(dev); s->elcr = 0; s->ltim = 0; @@ -228,7 +228,7 @@ static void pic_ioport_write(void *opaque, hwaddr addr64, uint64_t val64, unsigned size) { - PICCommonState *s = opaque; + I8259CommonState *s = opaque; uint32_t addr = addr64; uint32_t val = val64; int priority, cmd, irq; @@ -321,7 +321,7 @@ static uint64_t pic_ioport_read(void *opaque, hwaddr addr, unsigned size) { - PICCommonState *s = opaque; + I8259CommonState *s = opaque; int ret; if (s->poll) { @@ -348,7 +348,7 @@ return ret; } -int pic_get_output(PICCommonState *s) +int pic_get_output(I8259CommonState *s) { return (pic_get_irq(s) >= 0); } @@ -356,14 +356,14 @@ static void elcr_ioport_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PICCommonState *s = opaque; + I8259CommonState *s = opaque; s->elcr = val & s->elcr_mask; } static uint64_t elcr_ioport_read(void *opaque, hwaddr addr, unsigned size) { - PICCommonState *s = opaque; + I8259CommonState *s = opaque; return s->elcr; } @@ -387,7 +387,7 @@ static void pic_realize(DeviceState *dev, Error **errp) { - PICCommonState *s = I8259_COMMON(dev); + I8259CommonState *s = I8259_COMMON(dev); PICClass *pc = PIC_GET_CLASS(dev); memory_region_init_io(&s->base_io, OBJECT(s), &pic_base_ioport_ops, s, @@ -444,7 +444,7 @@ static const TypeInfo i8259_info = { .name = TYPE_I8259, - .instance_size = sizeof(PICCommonState), + .instance_size = sizeof(I8259CommonState), .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 e2f997e..17040bd 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c
@@ -33,7 +33,7 @@ static int irq_level[16]; static uint64_t irq_count[16]; -void pic_reset_common(PICCommonState *s) +void pic_reset_common(I8259CommonState *s) { s->last_irr = 0; s->irr &= s->elcr; @@ -55,7 +55,7 @@ static int pic_dispatch_pre_save(void *opaque) { - PICCommonState *s = opaque; + I8259CommonState *s = opaque; PICCommonClass *info = I8259_COMMON_GET_CLASS(s); if (info->pre_save) { @@ -67,7 +67,7 @@ static int pic_dispatch_post_load(void *opaque, int version_id) { - PICCommonState *s = opaque; + I8259CommonState *s = opaque; PICCommonClass *info = I8259_COMMON_GET_CLASS(s); if (info->post_load) { @@ -78,7 +78,7 @@ static void pic_common_realize(DeviceState *dev, Error **errp) { - PICCommonState *s = I8259_COMMON(dev); + I8259CommonState *s = I8259_COMMON(dev); ISADevice *isa = ISA_DEVICE(dev); isa_register_ioport(isa, &s->base_io, s->iobase); @@ -118,7 +118,7 @@ static bool pic_get_statistics(InterruptStatsProvider *obj, uint64_t **irq_counts, unsigned int *nb_irqs) { - PICCommonState *s = I8259_COMMON(obj); + I8259CommonState *s = I8259_COMMON(obj); if (s->master) { *irq_counts = irq_count; @@ -133,7 +133,7 @@ static void pic_print_info(InterruptStatsProvider *obj, GString *buf) { - PICCommonState *s = I8259_COMMON(obj); + I8259CommonState *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 bool ltim_state_needed(void *opaque) { - PICCommonState *s = I8259_COMMON(opaque); + I8259CommonState *s = I8259_COMMON(opaque); return !!s->ltim; } @@ -157,7 +157,7 @@ .minimum_version_id = 1, .needed = ltim_state_needed, .fields = (const VMStateField[]) { - VMSTATE_UINT8(ltim, PICCommonState), + VMSTATE_UINT8(ltim, I8259CommonState), VMSTATE_END_OF_LIST() } }; @@ -169,22 +169,22 @@ .pre_save = pic_dispatch_pre_save, .post_load = pic_dispatch_post_load, .fields = (const VMStateField[]) { - VMSTATE_UINT8(last_irr, PICCommonState), - VMSTATE_UINT8(irr, PICCommonState), - VMSTATE_UINT8(imr, PICCommonState), - VMSTATE_UINT8(isr, PICCommonState), - VMSTATE_UINT8(priority_add, PICCommonState), - VMSTATE_UINT8(irq_base, PICCommonState), - VMSTATE_UINT8(read_reg_select, PICCommonState), - VMSTATE_UINT8(poll, PICCommonState), - VMSTATE_UINT8(special_mask, PICCommonState), - VMSTATE_UINT8(init_state, PICCommonState), - VMSTATE_UINT8(auto_eoi, PICCommonState), - VMSTATE_UINT8(rotate_on_auto_eoi, PICCommonState), - VMSTATE_UINT8(special_fully_nested_mode, PICCommonState), - VMSTATE_UINT8(init4, PICCommonState), - VMSTATE_UINT8(single_mode, PICCommonState), - VMSTATE_UINT8(elcr, PICCommonState), + VMSTATE_UINT8(last_irr, I8259CommonState), + VMSTATE_UINT8(irr, I8259CommonState), + VMSTATE_UINT8(imr, I8259CommonState), + VMSTATE_UINT8(isr, I8259CommonState), + VMSTATE_UINT8(priority_add, I8259CommonState), + VMSTATE_UINT8(irq_base, I8259CommonState), + VMSTATE_UINT8(read_reg_select, I8259CommonState), + VMSTATE_UINT8(poll, I8259CommonState), + VMSTATE_UINT8(special_mask, I8259CommonState), + VMSTATE_UINT8(init_state, I8259CommonState), + VMSTATE_UINT8(auto_eoi, I8259CommonState), + VMSTATE_UINT8(rotate_on_auto_eoi, I8259CommonState), + VMSTATE_UINT8(special_fully_nested_mode, I8259CommonState), + VMSTATE_UINT8(init4, I8259CommonState), + VMSTATE_UINT8(single_mode, I8259CommonState), + VMSTATE_UINT8(elcr, I8259CommonState), VMSTATE_END_OF_LIST() }, .subsections = (const VMStateDescription * const []) { @@ -194,10 +194,10 @@ }; static const Property pic_properties_common[] = { - DEFINE_PROP_UINT32("iobase", PICCommonState, iobase, -1), - DEFINE_PROP_UINT32("elcr_addr", PICCommonState, elcr_addr, -1), - DEFINE_PROP_UINT8("elcr_mask", PICCommonState, elcr_mask, -1), - DEFINE_PROP_BIT("master", PICCommonState, master, 0, false), + DEFINE_PROP_UINT32("iobase", I8259CommonState, iobase, -1), + DEFINE_PROP_UINT32("elcr_addr", I8259CommonState, elcr_addr, -1), + DEFINE_PROP_UINT8("elcr_mask", I8259CommonState, elcr_mask, -1), + DEFINE_PROP_BIT("master", I8259CommonState, master, 0, false), }; static void pic_common_class_init(ObjectClass *klass, const void *data) @@ -222,7 +222,7 @@ static const TypeInfo pic_common_type = { .name = TYPE_I8259_COMMON, .parent = TYPE_ISA_DEVICE, - .instance_size = sizeof(PICCommonState), + .instance_size = sizeof(I8259CommonState), .class_size = sizeof(PICCommonClass), .class_init = pic_common_class_init, .abstract = true,
diff --git a/include/hw/intc/i8259.h b/include/hw/intc/i8259.h index 1f24202..1921a30 100644 --- a/include/hw/intc/i8259.h +++ b/include/hw/intc/i8259.h
@@ -3,9 +3,9 @@ /* i8259.c */ -typedef struct PICCommonState PICCommonState; +typedef struct I8259CommonState I8259CommonState; -extern PICCommonState *isa_pic; +extern I8259CommonState *isa_pic; /* * i8259_init() @@ -16,7 +16,7 @@ */ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq_in); qemu_irq *kvm_i8259_init(ISABus *bus); -int pic_get_output(PICCommonState *s); -int pic_read_irq(PICCommonState *s); +int pic_get_output(I8259CommonState *s); +int pic_read_irq(I8259CommonState *s); #endif
diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h index 289d08b..7a2f9ad 100644 --- a/include/hw/isa/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h
@@ -32,16 +32,16 @@ #define TYPE_I8259_COMMON "i8259-common" -OBJECT_DECLARE_TYPE(PICCommonState, PICCommonClass, I8259_COMMON) +OBJECT_DECLARE_TYPE(I8259CommonState, PICCommonClass, I8259_COMMON) struct PICCommonClass { DeviceClass parent_class; - void (*pre_save)(PICCommonState *s); - void (*post_load)(PICCommonState *s); + void (*pre_save)(I8259CommonState *s); + void (*post_load)(I8259CommonState *s); }; -struct PICCommonState { +struct I8259CommonState { ISADevice parent_obj; uint8_t last_irr; /* edge detection */ @@ -70,7 +70,7 @@ MemoryRegion elcr_io; }; -void pic_reset_common(PICCommonState *s); +void pic_reset_common(I8259CommonState *s); ISADevice *i8259_init_chip(const char *name, ISABus *bus, bool master); void pic_stat_update_irq(int irq, int level);