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/mainstone.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'hw/mainstone.c') diff --git a/hw/mainstone.c b/hw/mainstone.c index 151ea0e..3e517f0 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -77,7 +77,8 @@ static void mainstone_common_init(ram_addr_t ram_size, target_phys_addr_t mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 }; PXA2xxState *cpu; qemu_irq *mst_irq; - int i, index; + DriveInfo *dinfo; + int i; if (!cpu_model) cpu_model = "pxa270-c5"; @@ -92,8 +93,8 @@ static void mainstone_common_init(ram_addr_t ram_size, /* There are two 32MiB flash devices on the board */ for (i = 0; i < 2; i ++) { - index = drive_get_index(IF_PFLASH, 0, i); - if (index == -1) { + dinfo = drive_get(IF_PFLASH, 0, i); + if (!dinfo) { fprintf(stderr, "Two flash images must be given with the " "'pflash' parameter\n"); exit(1); @@ -101,7 +102,7 @@ static void mainstone_common_init(ram_addr_t ram_size, if (!pflash_cfi01_register(mainstone_flash_base[i], qemu_ram_alloc(MAINSTONE_FLASH), - drives_table[index].bdrv, sector_len, + dinfo->bdrv, sector_len, MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0)) { fprintf(stderr, "qemu: Error registering flash memory.\n"); exit(1); -- cgit v1.1