diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-04-03 20:32:46 +0900 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-04-07 13:51:48 +0200 |
| commit | 757179038c4884dc43c2ecd0f4da3facb24f262c (patch) | |
| tree | 76dd8c9d36c5324187b4650d672edb7fb9edb967 /hw/mips_r4k.c | |
| parent | e2982c3a27ab4c0879e61de3c9c57b838f7d0966 (diff) | |
ide: consolidate drive_get(IF_IDE)
factor out ide initialization to call drive_get(IF_IDE)
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/mips_r4k.c')
| -rw-r--r-- | hw/mips_r4k.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 8feb46163f..2834a46d52 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -287,15 +287,7 @@ void mips_r4k_init (ram_addr_t ram_size, if (nd_table[0].vlan) isa_ne2000_init(0x300, 9, &nd_table[0]); - if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) { - fprintf(stderr, "qemu: too many IDE bus\n"); - exit(1); - } - - for(i = 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) { - hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS); - } - + ide_drive_get(hd, MAX_IDE_BUS); for(i = 0; i < MAX_IDE_BUS; i++) isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i], hd[MAX_IDE_DEVS * i], |