aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-09-22 13:53:18 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-05 09:32:49 -0500
commitfd8014e132f7ce794cc7c913b583c7b2d0f747af (patch)
tree0b8f1e7dd34ddae1dd699c04e85ace7ded1b11a0 /hw/pc.c
parentef80b466230021da9fe490175cd542a58dcabe94 (diff)
downloadqemu-fd8014e132f7ce794cc7c913b583c7b2d0f747af.zip
qemu-fd8014e132f7ce794cc7c913b583c7b2d0f747af.tar.gz
qemu-fd8014e132f7ce794cc7c913b583c7b2d0f747af.tar.bz2
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/pc.c')
-rw-r--r--hw/pc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/pc.c b/hw/pc.c
index aea0f54..071b887 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1133,9 +1133,8 @@ static void pc_init1(ram_addr_t ram_size,
qemu_irq *isa_irq;
qemu_irq *i8259;
IsaIrqState *isa_irq_state;
- DriveInfo *dinfo;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
- BlockDriverState *fd[MAX_FD];
+ DriveInfo *fd[MAX_FD];
int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled;
void *fw_cfg;
@@ -1378,8 +1377,7 @@ static void pc_init1(ram_addr_t ram_size,
#endif
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);
}
floppy_controller = fdctrl_init_isa(fd);