From 751c6a17042b5d011013d6963c0505d671cf708e Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 22 Jul 2009 16:42:57 +0200 Subject: kill drives_table First step cleaning up the drives handling. This one does nothing but removing drives_table[], still it became seriously big. drive_get_index() is gone and is replaced by drives_get() which hands out DriveInfo pointers instead of a table index. This needs adaption in *tons* of places all over. The drives are now maintained as linked list. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/qdev.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'hw/qdev.c') diff --git a/hw/qdev.c b/hw/qdev.c index 97a9665424..479eb72b67 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -267,13 +267,10 @@ static int next_block_unit[IF_COUNT]; BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type) { int unit = next_block_unit[type]++; - int index; + DriveInfo *dinfo; - index = drive_get_index(type, 0, unit); - if (index == -1) { - return NULL; - } - return drives_table[index].bdrv; + dinfo = drive_get(type, 0, unit); + return dinfo ? dinfo->bdrv : NULL; } BusState *qdev_get_child_bus(DeviceState *dev, const char *name) @@ -296,14 +293,14 @@ void scsi_bus_new(DeviceState *host, SCSIAttachFn attach) { int bus = next_scsi_bus++; int unit; - int index; + DriveInfo *dinfo; for (unit = 0; unit < MAX_SCSI_DEVS; unit++) { - index = drive_get_index(IF_SCSI, bus, unit); - if (index == -1) { + dinfo = drive_get(IF_SCSI, bus, unit); + if (!dinfo) { continue; } - attach(host, drives_table[index].bdrv, unit); + attach(host, dinfo->bdrv, unit); } } -- cgit 1.4.1