aboutsummaryrefslogtreecommitdiff
path: root/hw/isa
diff options
context:
space:
mode:
authorBernhard Beschow <shentey@gmail.com>2022-03-01 23:00:36 +0100
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>2022-03-08 19:38:17 +0100
commitb2db46e4ca69d155790851cfb2b3a52b42ea6670 (patch)
tree33ecc60c19b8980b27824ebf712438e006cb5328 /hw/isa
parent27b4cfb94fa1a5d21df92516ef8f34e253f13bbc (diff)
downloadqemu-b2db46e4ca69d155790851cfb2b3a52b42ea6670.zip
qemu-b2db46e4ca69d155790851cfb2b3a52b42ea6670.tar.gz
qemu-b2db46e4ca69d155790851cfb2b3a52b42ea6670.tar.bz2
hw/isa: Drop unused attributes from ISADevice
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> Message-Id: <20220307134353.1950-13-philippe.mathieu.daude@gmail.com> Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Diffstat (limited to 'hw/isa')
-rw-r--r--hw/isa/isa-bus.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index af5add6..c64a141 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,