diff options
| author | Andreas Färber | 2012-11-25 02:37:14 +0100 |
|---|---|---|
| committer | Andreas Färber | 2013-06-07 12:14:45 +0200 |
| commit | db895a1e6a97e919f9b86d60c969377357b05066 (patch) | |
| tree | 72f6786abe90f7fa77d2f10416df73cb9d62e35a /hw/isa/isa-bus.c | |
| parent | cs4231a: QOM'ify some more (diff) | |
| download | qemu-db895a1e6a97e919f9b86d60c969377357b05066.tar.gz qemu-db895a1e6a97e919f9b86d60c969377357b05066.tar.xz qemu-db895a1e6a97e919f9b86d60c969377357b05066.zip | |
isa: Use realizefn for ISADevice
Drop ISADeviceClass::init and the resulting no-op initfn and let
children implement their own realizefn. Adapt error handling.
Split off an instance_init where sensible.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/isa/isa-bus.c')
| -rw-r--r-- | hw/isa/isa-bus.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 7860b17d66..f12b15da32 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -119,18 +119,6 @@ void isa_register_portio_list(ISADevice *dev, uint16_t start, portio_list_add(piolist, isabus->address_space_io, start); } -static int isa_qdev_init(DeviceState *qdev) -{ - ISADevice *dev = ISA_DEVICE(qdev); - ISADeviceClass *klass = ISA_DEVICE_GET_CLASS(dev); - - if (klass->init) { - return klass->init(dev); - } - - return 0; -} - static void isa_device_init(Object *obj) { ISADevice *dev = ISA_DEVICE(obj); @@ -230,7 +218,6 @@ static const TypeInfo isabus_bridge_info = { static void isa_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k = DEVICE_CLASS(klass); - k->init = isa_qdev_init; k->bus_type = TYPE_ISA_BUS; } |