Commit 0487eea4 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by John Snow
Browse files

ahci: split realize and init 



Do the init level tasks asap and the realize later (mainly when
num_ports is available). This allows sub-class realize routines
to work with the device post-init.

Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 1a7c7b2b32e5ccf49373a5065da5ece89730d3ac.1445917756.git.crosthwaite.peter@gmail.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 80274267

hw/ide/ahci.c

+23 −13
Original line number Diff line number Diff line
@@ -1434,24 +1434,26 @@ static const IDEDMAOps ahci_dma_ops = { 
    .cmd_done = ahci_cmd_done,

};



void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)

void ahci_init(AHCIState *s, DeviceState *qdev)

{

    qemu_irq *irqs;

    int i;



    s->as = as;

    s->ports = ports;

    s->dev = g_new0(AHCIDevice, ports);

    s->container = qdev;

    ahci_reg_init(s);

    /* XXX BAR size should be 1k, but that breaks, so bump it to 4k for now */

    memory_region_init_io(&s->mem, OBJECT(qdev), &ahci_mem_ops, s,

                          "ahci", AHCI_MEM_BAR_SIZE);

    memory_region_init_io(&s->idp, OBJECT(qdev), &ahci_idp_ops, s,

                          "ahci-idp", 32);

}



    irqs = qemu_allocate_irqs(ahci_irq_set, s, s->ports);

void ahci_realize(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)

{

    qemu_irq *irqs;

    int i;



    s->as = as;

    s->ports = ports;

    s->dev = g_new0(AHCIDevice, ports);

    ahci_reg_init(s);

    irqs = qemu_allocate_irqs(ahci_irq_set, s, s->ports);

    for (i = 0; i < s->ports; i++) {

        AHCIDevice *ad = &s->dev[i];
@@ -1646,17 +1648,24 @@ static void sysbus_ahci_reset(DeviceState *dev) 
    ahci_reset(&s->ahci);

}



static void sysbus_ahci_realize(DeviceState *dev, Error **errp)

static void sysbus_ahci_init(Object *obj)

{

    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

    SysbusAHCIState *s = SYSBUS_AHCI(dev);

    SysbusAHCIState *s = SYSBUS_AHCI(obj);

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);



    ahci_init(&s->ahci, dev, &address_space_memory, s->num_ports);

    ahci_init(&s->ahci, DEVICE(obj));



    sysbus_init_mmio(sbd, &s->ahci.mem);

    sysbus_init_irq(sbd, &s->ahci.irq);

}



static void sysbus_ahci_realize(DeviceState *dev, Error **errp)

{

    SysbusAHCIState *s = SYSBUS_AHCI(dev);



    ahci_realize(&s->ahci, dev, &address_space_memory, s->num_ports);

}



static Property sysbus_ahci_properties[] = {

    DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, num_ports, 1),

    DEFINE_PROP_END_OF_LIST(),
@@ -1677,6 +1686,7 @@ static const TypeInfo sysbus_ahci_info = { 
    .name          = TYPE_SYSBUS_AHCI,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(SysbusAHCIState),

    .instance_init = sysbus_ahci_init,

    .class_init    = sysbus_ahci_class_init,

};

hw/ide/ahci.h

+2 −1
Original line number Diff line number Diff line
@@ -366,7 +366,8 @@ typedef struct SDBFIS { 
    uint32_t payload;

} QEMU_PACKED SDBFIS;



void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports);

void ahci_realize(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports);

void ahci_init(AHCIState *s, DeviceState *qdev);

void ahci_uninit(AHCIState *s);



void ahci_reset(AHCIState *s);

hw/ide/ich.c

+9 −1
Original line number Diff line number Diff line
@@ -97,6 +97,13 @@ static void pci_ich9_reset(DeviceState *dev) 
    ahci_reset(&d->ahci);

}



static void pci_ich9_ahci_init(Object *obj)

{

    struct AHCIPCIState *d = ICH_AHCI(obj);



    ahci_init(&d->ahci, DEVICE(obj));

}



static void pci_ich9_ahci_realize(PCIDevice *dev, Error **errp)

{

    struct AHCIPCIState *d;
@@ -104,7 +111,7 @@ static void pci_ich9_ahci_realize(PCIDevice *dev, Error **errp) 
    uint8_t *sata_cap;

    d = ICH_AHCI(dev);



    ahci_init(&d->ahci, DEVICE(dev), pci_get_address_space(dev), 6);

    ahci_realize(&d->ahci, DEVICE(dev), pci_get_address_space(dev), 6);



    pci_config_set_prog_interface(dev->config, AHCI_PROGMODE_MAJOR_REV_1);
@@ -171,6 +178,7 @@ static const TypeInfo ich_ahci_info = { 
    .name          = TYPE_ICH9_AHCI,

    .parent        = TYPE_PCI_DEVICE,

    .instance_size = sizeof(AHCIPCIState),

    .instance_init = pci_ich9_ahci_init,

    .class_init    = ich_ahci_class_init,

};