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/sun4u.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/sun4u.c')
| -rw-r--r-- | hw/sun4u.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index ece83e6163..098df9da88 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -566,7 +566,7 @@ static void sun4uv_init(ram_addr_t RAM_size, long initrd_size, kernel_size; PCIBus *pci_bus, *pci_bus2, *pci_bus3; qemu_irq *irq; - BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; BlockDriverState *fd[MAX_FD]; void *fw_cfg; DriveInfo *dinfo; @@ -617,9 +617,8 @@ static void sun4uv_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, + hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS); - hd[i] = dinfo ? dinfo->bdrv : NULL; } pci_cmd646_ide_init(pci_bus, hd, 1); |