hw/ide: Rename ide_init2() -> ide_bus_init_output_irq()

ide_init2() initializes a IDEBus, and set its output IRQ.
To emphasize this, rename it as ide_bus_init_output_irq().

Mechanical change using:

  $ sed -i -e 's/ide_init2/ide_bus_init_output_irq/g' \
        $(git grep -l ide_init2)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230215112712.23110-15-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-09 11:27:23 +01:00
parent 783f447441
commit c951963043
11 changed files with 14 additions and 13 deletions

View File

@ -1554,7 +1554,7 @@ void ahci_realize(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)
AHCIDevice *ad = &s->dev[i]; AHCIDevice *ad = &s->dev[i];
ide_bus_init(&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]); ide_bus_init_output_irq(&ad->port, irqs[i]);
ad->hba = s; ad->hba = s;
ad->port_no = i; ad->port_no = i;

View File

@ -294,7 +294,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Error **errp)
qdev_init_gpio_in(ds, cmd646_set_irq, 2); qdev_init_gpio_in(ds, cmd646_set_irq, 2);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
ide_bus_init(&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)); ide_bus_init_output_irq(&d->bus[i], qdev_get_gpio_in(ds, i));
bmdma_init(&d->bus[i], &d->bmdma[i], d); bmdma_init(&d->bus[i], &d->bmdma[i], d);
d->bmdma[i].bus = &d->bus[i]; d->bmdma[i].bus = &d->bus[i];

View File

@ -2771,7 +2771,7 @@ static IDEDMA ide_dma_nop = {
.aiocb = NULL, .aiocb = NULL,
}; };
void ide_init2(IDEBus *bus, qemu_irq irq) void ide_bus_init_output_irq(IDEBus *bus, qemu_irq irq_out)
{ {
int i; int i;
@ -2779,7 +2779,7 @@ void ide_init2(IDEBus *bus, qemu_irq irq)
ide_init1(bus, i); ide_init1(bus, i);
ide_reset(&bus->ifs[i]); ide_reset(&bus->ifs[i]);
} }
bus->irq = irq; bus->irq = irq_out;
bus->dma = &ide_dma_nop; bus->dma = &ide_dma_nop;
} }

View File

@ -72,7 +72,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp)
ide_bus_init(&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); ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2);
ide_init2(&s->bus, isa_get_irq(isadev, s->irqnum)); ide_bus_init_output_irq(&s->bus, isa_get_irq(isadev, s->irqnum));
vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s); vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s);
ide_bus_register_restart_cb(&s->bus); ide_bus_register_restart_cb(&s->bus);
} }

View File

@ -420,7 +420,7 @@ static void macio_ide_realizefn(DeviceState *dev, Error **errp)
{ {
MACIOIDEState *s = MACIO_IDE(dev); MACIOIDEState *s = MACIO_IDE(dev);
ide_init2(&s->bus, s->ide_irq); ide_bus_init_output_irq(&s->bus, s->ide_irq);
/* Register DMA callbacks */ /* Register DMA callbacks */
s->dma.ops = &dbdma_ops; s->dma.ops = &dbdma_ops;

View File

@ -599,7 +599,7 @@ static void microdrive_realize(DeviceState *dev, Error **errp)
{ {
MicroDriveState *md = MICRODRIVE(dev); MicroDriveState *md = MICRODRIVE(dev);
ide_init2(&md->bus, qemu_allocate_irq(md_set_irq, md, 0)); ide_bus_init_output_irq(&md->bus, qemu_allocate_irq(md_set_irq, md, 0));
} }
static void microdrive_init(Object *obj) static void microdrive_init(Object *obj)

View File

@ -122,7 +122,7 @@ static void mmio_ide_realizefn(DeviceState *dev, Error **errp)
SysBusDevice *d = SYS_BUS_DEVICE(dev); SysBusDevice *d = SYS_BUS_DEVICE(dev);
MMIOIDEState *s = MMIO_IDE(dev); MMIOIDEState *s = MMIO_IDE(dev);
ide_init2(&s->bus, s->irq); ide_bus_init_output_irq(&s->bus, s->irq);
memory_region_init_io(&s->iomem1, OBJECT(s), &mmio_ide_ops, s, memory_region_init_io(&s->iomem1, OBJECT(s), &mmio_ide_ops, s,
"ide-mmio.1", 16 << s->shift); "ide-mmio.1", 16 << s->shift);

View File

@ -145,7 +145,8 @@ static int pci_piix_init_ports(PCIIDEState *d)
if (ret) { if (ret) {
return ret; return ret;
} }
ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq)); ide_bus_init_output_irq(&d->bus[i],
isa_get_irq(NULL, port_info[i].isairq));
bmdma_init(&d->bus[i], &d->bmdma[i], d); bmdma_init(&d->bus[i], &d->bmdma[i], d);
d->bmdma[i].bus = &d->bus[i]; d->bmdma[i].bus = &d->bus[i];

View File

@ -284,7 +284,7 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp)
qdev_init_gpio_in(ds, sii3112_set_irq, 2); qdev_init_gpio_in(ds, sii3112_set_irq, 2);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
ide_bus_init(&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)); ide_bus_init_output_irq(&s->bus[i], qdev_get_gpio_in(ds, i));
bmdma_init(&s->bus[i], &s->bmdma[i], s); bmdma_init(&s->bus[i], &s->bmdma[i], s);
s->bmdma[i].bus = &s->bus[i]; s->bmdma[i].bus = &s->bus[i];

View File

@ -191,7 +191,7 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)
qdev_init_gpio_in(ds, via_ide_set_irq, 2); qdev_init_gpio_in(ds, via_ide_set_irq, 2);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
ide_bus_init(&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)); ide_bus_init_output_irq(&d->bus[i], qdev_get_gpio_in(ds, i));
bmdma_init(&d->bus[i], &d->bmdma[i], d); bmdma_init(&d->bus[i], &d->bmdma[i], d);
d->bmdma[i].bus = &d->bus[i]; d->bmdma[i].bus = &d->bus[i];

View File

@ -488,7 +488,7 @@ struct IDEBus {
IDEDMA *dma; IDEDMA *dma;
uint8_t unit; uint8_t unit;
uint8_t cmd; uint8_t cmd;
qemu_irq irq; qemu_irq irq; /* bus output */
int error_status; int error_status;
uint8_t retry_unit; uint8_t retry_unit;
@ -616,8 +616,8 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDEDriveKind kind,
uint64_t wwn, uint64_t wwn,
uint32_t cylinders, uint32_t heads, uint32_t secs, uint32_t cylinders, uint32_t heads, uint32_t secs,
int chs_trans, Error **errp); int chs_trans, Error **errp);
void ide_init2(IDEBus *bus, qemu_irq irq);
void ide_exit(IDEState *s); void ide_exit(IDEState *s);
void ide_bus_init_output_irq(IDEBus *bus, qemu_irq irq_out);
int ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2); int ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2);
void ide_bus_set_irq(IDEBus *bus); void ide_bus_set_irq(IDEBus *bus);
void ide_bus_register_restart_cb(IDEBus *bus); void ide_bus_register_restart_cb(IDEBus *bus);