diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-22 13:53:18 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:49 -0500 |
| commit | fd8014e132f7ce794cc7c913b583c7b2d0f747af (patch) | |
| tree | 0b8f1e7dd34ddae1dd699c04e85ace7ded1b11a0 /hw/sun4u.c | |
| parent | ef80b466230021da9fe490175cd542a58dcabe94 (diff) | |
| download | qemu-fd8014e132f7ce794cc7c913b583c7b2d0f747af.tar.gz qemu-fd8014e132f7ce794cc7c913b583c7b2d0f747af.tar.bz2 qemu-fd8014e132f7ce794cc7c913b583c7b2d0f747af.zip | |
floppy: add drive properties.
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 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index e4097b43ad..f77714e247 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -573,9 +573,8 @@ static void sun4uv_init(ram_addr_t RAM_size, PCIBus *pci_bus, *pci_bus2, *pci_bus3; qemu_irq *irq; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - BlockDriverState *fd[MAX_FD]; + DriveInfo *fd[MAX_FD]; void *fw_cfg; - DriveInfo *dinfo; /* init CPUs */ env = cpu_devinit(cpu_model, hwdef); @@ -630,8 +629,7 @@ static void sun4uv_init(ram_addr_t RAM_size, isa_create_simple("i8042"); for(i = 0; i < MAX_FD; i++) { - dinfo = drive_get(IF_FLOPPY, 0, i); - fd[i] = dinfo ? dinfo->bdrv : NULL; + fd[i] = drive_get(IF_FLOPPY, 0, i); } fdctrl_init_isa(fd); nvram = m48t59_init_isa(0x0074, NVRAM_SIZE, 59); |