commit f455e98cf437c7bb8f2b23888bbd302fef3a3b28
author Gerd Hoffmann <kraxel@redhat.com> Fri Aug 28 15:47:03 2009 +0200
committer Anthony Liguori <aliguori@us.ibm.com> Fri Sep 04 09:37:27 2009 -0500
tree 453978b84f1054ecbfd4c0c18ebc05f8d89474d0
parent ddd9bbd93bb2c12ade72dff1790d6d292aac073f

ide: pass down DriveInfo instead of BlockDriverState

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

hw/ppc_prep.c

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 1cad17f..c081d58 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -563,7 +563,7 @@
     qemu_irq *i8259;
     int ppc_boot_device;
     DriveInfo *dinfo;
-    BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
+    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
     BlockDriverState *fd[MAX_FD];
 
     sysctrl = qemu_mallocz(sizeof(sysctrl_t));
@@ -703,8 +703,7 @@
     }
 
     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++) {