On Thu, Sep 23, 2021 at 8:12 AM Peter Maydell wrote: > The function ide_bus_new() does an in-place initialization. Rename > it to ide_bus_init() to follow our _init vs _new convention. > > Signed-off-by: Peter Maydell > --- > include/hw/ide/internal.h | 4 ++-- > hw/ide/ahci.c | 2 +- > hw/ide/cmd646.c | 2 +- > hw/ide/isa.c | 2 +- > hw/ide/macio.c | 2 +- > hw/ide/microdrive.c | 2 +- > hw/ide/mmio.c | 2 +- > hw/ide/piix.c | 2 +- > hw/ide/qdev.c | 2 +- > hw/ide/sii3112.c | 2 +- > hw/ide/via.c | 2 +- > 11 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h > index 79172217ccb..97e7e59dc58 100644 > --- a/include/hw/ide/internal.h > +++ b/include/hw/ide/internal.h > @@ -648,8 +648,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, size_t idebus_size, DeviceState *dev, > - int bus_id, int max_units); > +void ide_bus_init(IDEBus *idebus, size_t idebus_size, DeviceState *dev, > + int bus_id, int max_units); > IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive); > > int ide_handle_rw_error(IDEState *s, int error, int op); > diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c > index f2c51574839..a94c6e26fb0 100644 > --- a/hw/ide/ahci.c > +++ b/hw/ide/ahci.c > @@ -1548,7 +1548,7 @@ void ahci_realize(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, sizeof(ad->port), qdev, i, 1); > + ide_bus_init(&ad->port, sizeof(ad->port), qdev, i, 1); > ide_init2(&ad->port, irqs[i]); > > ad->hba = s; > diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c > index c2546314855..94c576262c1 100644 > --- a/hw/ide/cmd646.c > +++ b/hw/ide/cmd646.c > @@ -293,7 +293,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, > Error **errp) > > qdev_init_gpio_in(ds, cmd646_set_irq, 2); > for (i = 0; i < 2; i++) { > - ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2); > + ide_bus_init(&d->bus[i], sizeof(d->bus[i]), ds, i, 2); > ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i)); > > bmdma_init(&d->bus[i], &d->bmdma[i], d); > diff --git a/hw/ide/isa.c b/hw/ide/isa.c > index 6bc19de2265..24bbde24c2b 100644 > --- a/hw/ide/isa.c > +++ b/hw/ide/isa.c > @@ -73,7 +73,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, sizeof(s->bus), dev, 0, 2); > + ide_bus_init(&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); > diff --git a/hw/ide/macio.c b/hw/ide/macio.c > index b270a101632..b03d401ceb5 100644 > --- a/hw/ide/macio.c > +++ b/hw/ide/macio.c > @@ -449,7 +449,7 @@ static void macio_ide_initfn(Object *obj) > SysBusDevice *d = SYS_BUS_DEVICE(obj); > MACIOIDEState *s = MACIO_IDE(obj); > > - ide_bus_new(&s->bus, sizeof(s->bus), DEVICE(obj), 0, 2); > + ide_bus_init(&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->real_ide_irq); > diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c > index 58a14fea363..6df9b4cbbe1 100644 > --- a/hw/ide/microdrive.c > +++ b/hw/ide/microdrive.c > @@ -605,7 +605,7 @@ static void microdrive_init(Object *obj) > { > MicroDriveState *md = MICRODRIVE(obj); > > - ide_bus_new(&md->bus, sizeof(md->bus), DEVICE(obj), 0, 1); > + ide_bus_init(&md->bus, sizeof(md->bus), DEVICE(obj), 0, 1); > } > > static void microdrive_class_init(ObjectClass *oc, void *data) > diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c > index 36e2f4790ab..fb2ebd4847f 100644 > --- a/hw/ide/mmio.c > +++ b/hw/ide/mmio.c > @@ -142,7 +142,7 @@ static void mmio_ide_initfn(Object *obj) > SysBusDevice *d = SYS_BUS_DEVICE(obj); > MMIOState *s = MMIO_IDE(obj); > > - ide_bus_new(&s->bus, sizeof(s->bus), DEVICE(obj), 0, 2); > + ide_bus_init(&s->bus, sizeof(s->bus), DEVICE(obj), 0, 2); > sysbus_init_irq(d, &s->irq); > } > > diff --git a/hw/ide/piix.c b/hw/ide/piix.c > index d3e738320be..ce89fd0aa36 100644 > --- a/hw/ide/piix.c > +++ b/hw/ide/piix.c > @@ -137,7 +137,7 @@ static int pci_piix_init_ports(PCIIDEState *d) > int i, ret; > > for (i = 0; i < 2; i++) { > - ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); > + ide_bus_init(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); > ret = ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase, > port_info[i].iobase2); > if (ret) { > diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c > index ca844419106..618045b85ac 100644 > --- a/hw/ide/qdev.c > +++ b/hw/ide/qdev.c > @@ -68,7 +68,7 @@ static const TypeInfo ide_bus_info = { > .class_init = ide_bus_class_init, > }; > > -void ide_bus_new(IDEBus *idebus, size_t idebus_size, DeviceState *dev, > +void ide_bus_init(IDEBus *idebus, size_t idebus_size, DeviceState *dev, > int bus_id, int max_units) > { > qbus_init(idebus, idebus_size, TYPE_IDE_BUS, dev, NULL); > diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c > index 34c347b9c20..46204f10d75 100644 > --- a/hw/ide/sii3112.c > +++ b/hw/ide/sii3112.c > @@ -283,7 +283,7 @@ static void sii3112_pci_realize(PCIDevice *dev, Error > **errp) > > qdev_init_gpio_in(ds, sii3112_set_irq, 2); > for (i = 0; i < 2; i++) { > - ide_bus_new(&s->bus[i], sizeof(s->bus[i]), ds, i, 1); > + ide_bus_init(&s->bus[i], sizeof(s->bus[i]), ds, i, 1); > ide_init2(&s->bus[i], qdev_get_gpio_in(ds, i)); > > bmdma_init(&s->bus[i], &s->bmdma[i], s); > diff --git a/hw/ide/via.c b/hw/ide/via.c > index be09912b334..94cc2142c70 100644 > --- a/hw/ide/via.c > +++ b/hw/ide/via.c > @@ -190,7 +190,7 @@ static void via_ide_realize(PCIDevice *dev, Error > **errp) > > qdev_init_gpio_in(ds, via_ide_set_irq, 2); > for (i = 0; i < 2; i++) { > - ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2); > + ide_bus_init(&d->bus[i], sizeof(d->bus[i]), ds, i, 2); > ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i)); > > bmdma_init(&d->bus[i], &d->bmdma[i], d); > -- > 2.20.1 > > Reviewed-by: John Snow Acked-by: John Snow (Feel free to merge.) --js