diff options
| author |   Gerd Hoffmann <kraxel@redhat.com> | 2009-08-28 15:47:03 +0200 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-09-04 09:37:27 -0500 |
| commit | f455e98cf437c7bb8f2b23888bbd302fef3a3b28 (patch) | |
| tree | 453978b84f1054ecbfd4c0c18ebc05f8d89474d0 /hw/ppc_prep.c | |
| parent | Support for multiple -monitor devices (diff) | |
| download | qemu-kvm-f455e98cf437c7bb8f2b23888bbd302fef3a3b28.tar.gz qemu-kvm-f455e98cf437c7bb8f2b23888bbd302fef3a3b28.tar.bz2 qemu-kvm-f455e98cf437c7bb8f2b23888bbd302fef3a3b28.zip | |
ide: pass down DriveInfo instead of BlockDriverState
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ppc_prep.c')
| -rw-r--r-- | hw/ppc_prep.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 1cad17f6f..c081d5835 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -563,7 +563,7 @@ static void ppc_prep_init (ram_addr_t ram_size, 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 @@ static void ppc_prep_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++) { |