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_malta.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hw/mips_malta.c') diff --git a/hw/mips_malta.c b/hw/mips_malta.c index a70d79edb8..275f72c650 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -775,7 +775,7 @@ void mips_malta_init (ram_addr_t ram_size, i2c_bus *smbus; int i; DriveInfo *dinfo; - BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; BlockDriverState *fd[MAX_FD]; int fl_idx = 0; int fl_sectors = 0; @@ -899,8 +899,7 @@ void mips_malta_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); } piix4_devfn = piix4_init(pci_bus, 80); -- cgit v1.2.3-55-g7522