mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
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>
This commit is contained in:
parent
8a14daa5a1
commit
751c6a1704
36 changed files with 308 additions and 343 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue