hw/ide: Rename ide_register_restart_cb -> ide_bus_register_restart_cb

ide_register_restart_cb() operates on a IDEBus; rename it as
ide_bus_register_restart_cb() to emphasize its first argument
is a IDEBus.

Mechanical change using:

  $ sed -i -e 's/ide_register_restart_cb/ide_bus_register_restart_cb/g' \
    $(git grep -l ide_register_restart_cb)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230215112712.23110-13-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-14 16:33:38 +01:00
parent b6a5ab27fb
commit e29b124610
8 changed files with 8 additions and 8 deletions

View File

@ -1560,7 +1560,7 @@ void ahci_realize(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports)
ad->port_no = i; ad->port_no = i;
ad->port.dma = &ad->dma; ad->port.dma = &ad->dma;
ad->port.dma->ops = &ahci_dma_ops; ad->port.dma->ops = &ahci_dma_ops;
ide_register_restart_cb(&ad->port); ide_bus_register_restart_cb(&ad->port);
} }
g_free(irqs); g_free(irqs);
} }

View File

@ -298,7 +298,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Error **errp)
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];
ide_register_restart_cb(&d->bus[i]); ide_bus_register_restart_cb(&d->bus[i]);
} }
} }

View File

@ -2759,7 +2759,7 @@ static void ide_restart_cb(void *opaque, bool running, RunState state)
} }
} }
void ide_register_restart_cb(IDEBus *bus) void ide_bus_register_restart_cb(IDEBus *bus)
{ {
if (bus->dma->ops->restart_dma) { if (bus->dma->ops->restart_dma) {
bus->vmstate = qemu_add_vm_change_state_handler(ide_restart_cb, bus); bus->vmstate = qemu_add_vm_change_state_handler(ide_restart_cb, bus);

View File

@ -74,7 +74,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp)
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_init2(&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_register_restart_cb(&s->bus); ide_bus_register_restart_cb(&s->bus);
} }
ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum, ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum,

View File

@ -149,7 +149,7 @@ static int pci_piix_init_ports(PCIIDEState *d)
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];
ide_register_restart_cb(&d->bus[i]); ide_bus_register_restart_cb(&d->bus[i]);
} }
return 0; return 0;

View File

@ -288,7 +288,7 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp)
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];
ide_register_restart_cb(&s->bus[i]); ide_bus_register_restart_cb(&s->bus[i]);
} }
} }

View File

@ -195,7 +195,7 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)
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];
ide_register_restart_cb(&d->bus[i]); ide_bus_register_restart_cb(&d->bus[i]);
} }
} }

View File

@ -620,7 +620,7 @@ void ide_init2(IDEBus *bus, qemu_irq irq);
void ide_exit(IDEState *s); void ide_exit(IDEState *s);
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_register_restart_cb(IDEBus *bus); void ide_bus_register_restart_cb(IDEBus *bus);
void ide_exec_cmd(IDEBus *bus, uint32_t val); void ide_exec_cmd(IDEBus *bus, uint32_t val);