hw/ide: Rename ide_create_drive() -> ide_bus_create_drive()
ide_create_drive() operates on a IDEBus; rename it as ide_bus_create_drive() to emphasize its first argument is a IDEBus. Mechanical change using: $ sed -i -e 's/ide_create_drive/ide_bus_create_drive/g' \ $(git grep -wl ide_create_drive) Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230215112712.23110-12-philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
0cfe719d1f
commit
b6a5ab27fb
|
@ -554,7 +554,7 @@ static void create_ahci(const SBSAMachineState *sms)
|
|||
if (hd[i] == NULL) {
|
||||
continue;
|
||||
}
|
||||
ide_create_drive(&ahci->dev[i].port, 0, hd[i]);
|
||||
ide_bus_create_drive(&ahci->dev[i].port, 0, hd[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1842,7 +1842,7 @@ void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd)
|
|||
if (hd[i] == NULL) {
|
||||
continue;
|
||||
}
|
||||
ide_create_drive(&ahci->dev[i].port, 0, hd[i]);
|
||||
ide_bus_create_drive(&ahci->dev[i].port, 0, hd[i]);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -93,10 +93,10 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum,
|
|||
|
||||
s = ISA_IDE(dev);
|
||||
if (hd0) {
|
||||
ide_create_drive(&s->bus, 0, hd0);
|
||||
ide_bus_create_drive(&s->bus, 0, hd0);
|
||||
}
|
||||
if (hd1) {
|
||||
ide_create_drive(&s->bus, 1, hd1);
|
||||
ide_bus_create_drive(&s->bus, 1, hd1);
|
||||
}
|
||||
return isadev;
|
||||
}
|
||||
|
|
|
@ -501,7 +501,7 @@ void macio_ide_init_drives(MACIOIDEState *s, DriveInfo **hd_table)
|
|||
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (hd_table[i]) {
|
||||
ide_create_drive(&s->bus, i, hd_table[i]);
|
||||
ide_bus_create_drive(&s->bus, i, hd_table[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -566,7 +566,7 @@ PCMCIACardState *dscm1xxxx_init(DriveInfo *dinfo)
|
|||
qdev_realize(DEVICE(md), NULL, &error_fatal);
|
||||
|
||||
if (dinfo != NULL) {
|
||||
ide_create_drive(&md->bus, 0, dinfo);
|
||||
ide_bus_create_drive(&md->bus, 0, dinfo);
|
||||
}
|
||||
md->bus.ifs[0].drive_kind = IDE_CFATA;
|
||||
md->bus.ifs[0].mdata_size = METADATA_SIZE;
|
||||
|
|
|
@ -174,10 +174,10 @@ void mmio_ide_init_drives(DeviceState *dev, DriveInfo *hd0, DriveInfo *hd1)
|
|||
MMIOIDEState *s = MMIO_IDE(dev);
|
||||
|
||||
if (hd0 != NULL) {
|
||||
ide_create_drive(&s->bus, 0, hd0);
|
||||
ide_bus_create_drive(&s->bus, 0, hd0);
|
||||
}
|
||||
if (hd1 != NULL) {
|
||||
ide_create_drive(&s->bus, 1, hd1);
|
||||
ide_bus_create_drive(&s->bus, 1, hd1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -489,7 +489,7 @@ void pci_ide_create_devs(PCIDevice *dev)
|
|||
ide_drive_get(hd_table, ARRAY_SIZE(hd_table));
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (hd_table[i]) {
|
||||
ide_create_drive(d->bus + bus[i], unit[i], hd_table[i]);
|
||||
ide_bus_create_drive(d->bus + bus[i], unit[i], hd_table[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -124,7 +124,7 @@ static void ide_qdev_realize(DeviceState *qdev, Error **errp)
|
|||
dc->realize(dev, errp);
|
||||
}
|
||||
|
||||
IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive)
|
||||
IDEDevice *ide_bus_create_drive(IDEBus *bus, int unit, DriveInfo *drive)
|
||||
{
|
||||
DeviceState *dev;
|
||||
|
||||
|
|
|
@ -645,7 +645,7 @@ void ide_atapi_cmd_reply_end(IDEState *s);
|
|||
/* hw/ide/qdev.c */
|
||||
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);
|
||||
IDEDevice *ide_bus_create_drive(IDEBus *bus, int unit, DriveInfo *drive);
|
||||
|
||||
int ide_handle_rw_error(IDEState *s, int error, int op);
|
||||
|
||||
|
|
Loading…
Reference in New Issue