| Message ID | 20220307134353.1950-13-philippe.mathieu.daude@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw: ISA & MIPS patches from Bernhard Beschow | expand |
Am 7. März 2022 13:43:52 UTC schrieb "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>: >From: Bernhard Beschow <shentey@gmail.com> > >Now that the last users of ISADevice::isairq[] have been resolved during the >previous commits, it can be removed for good. > >Signed-off-by: Bernhard Beschow <shentey@gmail.com> >Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >Message-Id: <20220301220037.76555-7-shentey@gmail.com> >Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >--- > hw/isa/isa-bus.c | 13 ------------- > include/hw/isa/isa.h | 2 -- > 2 files changed, 15 deletions(-) > >diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c >index af5add6a26..c64a14120b 100644 >--- a/hw/isa/isa-bus.c >+++ b/hw/isa/isa-bus.c >@@ -87,11 +87,7 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) > > void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) > { >- assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); >- assert(isairq < ISA_NUM_IRQS); >- dev->isairq[dev->nirqs] = isairq; > *p = isa_get_irq(dev, isairq); >- dev->nirqs++; > } > > void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq) >@@ -150,14 +146,6 @@ int isa_register_portio_list(ISADevice *dev, > return 0; > } > >-static void isa_device_init(Object *obj) >-{ >- ISADevice *dev = ISA_DEVICE(obj); >- >- dev->isairq[0] = -1; >- dev->isairq[1] = -1; >-} >- > ISADevice *isa_new(const char *name) > { > return ISA_DEVICE(qdev_new(name)); >@@ -244,7 +232,6 @@ static const TypeInfo isa_device_type_info = { > .name = TYPE_ISA_DEVICE, > .parent = TYPE_DEVICE, > .instance_size = sizeof(ISADevice), >- .instance_init = isa_device_init, > .abstract = true, > .class_size = sizeof(ISADeviceClass), > .class_init = isa_device_class_init, >diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h >index d4417b34b6..d80cab5b79 100644 >--- a/include/hw/isa/isa.h >+++ b/include/hw/isa/isa.h >@@ -83,8 +83,6 @@ struct ISADevice { > DeviceState parent_obj; > /*< public >*/ > >- int8_t isairq[2]; /* -1 = unassigned */ >- int nirqs; > int ioport_id; > }; > Reviewed-by: Bernhard Beschow <shentey@gmail.com>
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index af5add6a26..c64a14120b 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -87,11 +87,7 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) { - assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); - assert(isairq < ISA_NUM_IRQS); - dev->isairq[dev->nirqs] = isairq; *p = isa_get_irq(dev, isairq); - dev->nirqs++; } void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq) @@ -150,14 +146,6 @@ int isa_register_portio_list(ISADevice *dev, return 0; } -static void isa_device_init(Object *obj) -{ - ISADevice *dev = ISA_DEVICE(obj); - - dev->isairq[0] = -1; - dev->isairq[1] = -1; -} - ISADevice *isa_new(const char *name) { return ISA_DEVICE(qdev_new(name)); @@ -244,7 +232,6 @@ static const TypeInfo isa_device_type_info = { .name = TYPE_ISA_DEVICE, .parent = TYPE_DEVICE, .instance_size = sizeof(ISADevice), - .instance_init = isa_device_init, .abstract = true, .class_size = sizeof(ISADeviceClass), .class_init = isa_device_class_init, diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index d4417b34b6..d80cab5b79 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -83,8 +83,6 @@ struct ISADevice { DeviceState parent_obj; /*< public >*/ - int8_t isairq[2]; /* -1 = unassigned */ - int nirqs; int ioport_id; };