Commit c538ca66 authored by Andreas Färber's avatar Andreas Färber Committed by Anthony Liguori
Browse files

isa: Split off instance_init for ISADevice 



Prepares for assigning IRQs before QOM realize.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Message-id: 1361010446-1427-1-git-send-email-afaerber@suse.de
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 872536bf

hw/isa-bus.c

+9 −3
Original line number Diff line number Diff line
@@ -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,