Commit c6baf942 authored by Andreas Färber's avatar Andreas Färber
Browse files

ide: Pass size to ide_bus_new() 



To be passed to qbus_create_inplace().

Reviewed-by: default avatarWenchao Xia <xiawenc@linux.vnet.ibm.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent 77cbb28a

hw/ide/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports) 
    for (i = 0; i < s->ports; i++) {

        AHCIDevice *ad = &s->dev[i];



        ide_bus_new(&ad->port, qdev, i, 1);

        ide_bus_new(&ad->port, sizeof(ad->port), qdev, i, 1);

        ide_init2(&ad->port, irqs[i]);



        ad->hba = s;

hw/ide/cmd646.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) 


    irq = qemu_allocate_irqs(cmd646_set_irq, d, 2);

    for (i = 0; i < 2; i++) {

        ide_bus_new(&d->bus[i], DEVICE(dev), i, 2);

        ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(dev), i, 2);

        ide_init2(&d->bus[i], irq[i]);



        bmdma_init(&d->bus[i], &d->bmdma[i], d);

hw/ide/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -576,7 +576,8 @@ void ide_atapi_cmd(IDEState *s); 
void ide_atapi_cmd_reply_end(IDEState *s);



/* hw/ide/qdev.c */

void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id, int max_units);

void ide_bus_new(IDEBus *idebus, size_t idebus_size, DeviceState *dev,

                 int bus_id, int max_units);

IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive);



#endif /* HW_IDE_INTERNAL_H */

hw/ide/isa.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp) 
    ISADevice *isadev = ISA_DEVICE(dev);

    ISAIDEState *s = ISA_IDE(dev);



    ide_bus_new(&s->bus, dev, 0, 2);

    ide_bus_new(&s->bus, sizeof(s->bus), dev, 0, 2);

    ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);

    isa_init_irq(isadev, &s->irq, s->isairq);

    ide_init2(&s->bus, s->irq);

hw/ide/macio.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static void macio_ide_initfn(Object *obj) 
    SysBusDevice *d = SYS_BUS_DEVICE(obj);

    MACIOIDEState *s = MACIO_IDE(obj);



    ide_bus_new(&s->bus, DEVICE(obj), 0, 2);

    ide_bus_new(&s->bus, sizeof(s->bus), DEVICE(obj), 0, 2);

    memory_region_init_io(&s->mem, obj, &pmac_ide_ops, s, "pmac-ide", 0x1000);

    sysbus_init_mmio(d, &s->mem);

    sysbus_init_irq(d, &s->irq);