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/r2d.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'hw/r2d.c') diff --git a/hw/r2d.c b/hw/r2d.c index 8ce68325c2..697bcb6a49 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -203,6 +203,7 @@ static void r2d_init(ram_addr_t ram_size, ram_addr_t sdram_addr; qemu_irq *irq; PCIBus *pci; + DriveInfo *dinfo; int i; if (!cpu_model) @@ -225,9 +226,9 @@ static void r2d_init(ram_addr_t ram_size, sm501_init(0x10000000, SM501_VRAM_SIZE, irq[SM501], serial_hds[2]); /* onboard CF (True IDE mode, Master only). */ - if ((i = drive_get_index(IF_IDE, 0, 0)) != -1) + if ((dinfo = drive_get(IF_IDE, 0, 0)) != NULL) mmio_ide_init(0x14001000, 0x1400080c, irq[CF_IDE], 1, - drives_table[i].bdrv, NULL); + dinfo->bdrv, NULL); /* NIC: rtl8139 on-board, and 2 slots. */ for (i = 0; i < nb_nics; i++) -- cgit v1.2.3