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_newworld.c | |
| parent | ddd9bbd93bb2c12ade72dff1790d6d292aac073f (diff) | |
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_newworld.c')
| -rw-r--r-- | hw/ppc_newworld.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 3ad00572e2..4951ea745c 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -107,8 +107,7 @@ static void ppc_core99_init (ram_addr_t ram_size, qemu_irq *dummy_irq; int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index; int ppc_boot_device; - DriveInfo *dinfo; - BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; void *fw_cfg; void *dbdma; uint8_t *vga_bios_ptr; @@ -316,8 +315,7 @@ static void ppc_core99_init (ram_addr_t ram_size, exit(1); } 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); } dbdma = DBDMA_init(&dbdma_mem_index); pci_cmd646_ide_init(pci_bus, hd, 0); |