From: Andreas Färber Date: Sat, 16 Feb 2013 10:27:26 +0000 (+0100) Subject: isa: Split off instance_init for ISADevice X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~1107 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c538ca66ffec97432057d3fe1aa5a4bb417ae9e9;p=qemu-xen.git isa: Split off instance_init for ISADevice Prepares for assigning IRQs before QOM realize. Signed-off-by: Andreas Färber Signed-off-by: Andreas Färber Message-id: 1361010446-1427-1-git-send-email-afaerber@suse.de Signed-off-by: Anthony Liguori --- diff --git a/hw/isa-bus.c b/hw/isa-bus.c index fce311bc2a..6dc34f09f3 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -124,9 +124,6 @@ static int isa_qdev_init(DeviceState *qdev) ISADevice *dev = ISA_DEVICE(qdev); ISADeviceClass *klass = ISA_DEVICE_GET_CLASS(dev); - dev->isairq[0] = -1; - dev->isairq[1] = -1; - if (klass->init) { return klass->init(dev); } @@ -134,6 +131,14 @@ static int isa_qdev_init(DeviceState *qdev) return 0; } +static void isa_device_init(Object *obj) +{ + ISADevice *dev = ISA_DEVICE(obj); + + dev->isairq[0] = -1; + dev->isairq[1] = -1; +} + ISADevice *isa_create(ISABus *bus, const char *name) { DeviceState *dev; @@ -233,6 +238,7 @@ 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,