From f455e98cf437c7bb8f2b23888bbd302fef3a3b28 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 28 Aug 2009 15:47:03 +0200 Subject: ide: pass down DriveInfo instead of BlockDriverState Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/mips_r4k.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hw/mips_r4k.c') diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 24c188430..da5ca319c 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -156,7 +156,7 @@ void mips_r4k_init (ram_addr_t ram_size, RTCState *rtc_state; int i; qemu_irq *i8259; - BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; DriveInfo *dinfo; /* init CPUs */ @@ -268,8 +268,7 @@ void mips_r4k_init (ram_addr_t ram_size, } for(i = 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) { - dinfo = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS); - hd[i] = dinfo ? dinfo->bdrv : NULL; + hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS); } for(i = 0; i < MAX_IDE_BUS; i++) -- cgit v1.2.3-65-gdbad