diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-07-22 16:42:57 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-27 14:08:23 -0500 |
| commit | 751c6a17042b5d011013d6963c0505d671cf708e (patch) | |
| tree | 61a769ed1a1c16ebdfc1397ce9d775222dfa8e57 /hw/petalogix_s3adsp1800_mmu.c | |
| parent | 8a14daa5a1ae22fcfc317f4727a88d6c15c39aae (diff) | |
| download | qemu-751c6a17042b5d011013d6963c0505d671cf708e.zip qemu-751c6a17042b5d011013d6963c0505d671cf708e.tar.gz qemu-751c6a17042b5d011013d6963c0505d671cf708e.tar.bz2 | |
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 <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/petalogix_s3adsp1800_mmu.c')
| -rw-r--r-- | hw/petalogix_s3adsp1800_mmu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c index c2a196f..1a1cc0e3 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/petalogix_s3adsp1800_mmu.c @@ -106,6 +106,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, DeviceState *dev; CPUState *env; int kernel_size; + DriveInfo *dinfo; int i; target_phys_addr_t ddr_base = 0x90000000; ram_addr_t phys_lmb_bram; @@ -131,9 +132,9 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, cpu_register_physical_memory(ddr_base, ram_size, phys_ram | IO_MEM_RAM); phys_flash = qemu_ram_alloc(FLASH_SIZE); - i = drive_get_index(IF_PFLASH, 0, 0); + dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi02_register(0xa0000000, phys_flash, - i != -1 ? drives_table[i].bdrv : NULL, (64 * 1024), + dinfo ? dinfo->bdrv : NULL, (64 * 1024), FLASH_SIZE >> 16, 1, 1, 0x0000, 0x0000, 0x0000, 0x0000, 0x555, 0x2aa); |