OSDN Git Service

fdc: Move floppy geometry guessing back from block.c
authorMarkus Armbruster <armbru@redhat.com>
Tue, 10 Jul 2012 09:12:27 +0000 (11:12 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 17 Jul 2012 14:48:29 +0000 (16:48 +0200)
commit61a8d649ff1e125966b51d688ff43dc6ef6ca63b
treed9ec8477cde6fa07b501b2d0b19190a4b4915c1a
parent19db9b9042657ef80ddd4c94b1748dc2368aab70
fdc: Move floppy geometry guessing back from block.c

Commit 5bbdbb46 moved it to block.c because "other geometry guessing
functions already reside in block.c".  Device-specific functionality
should be kept in device code, not the block layer.  Move it back.

Disk geometry guessing is still in block.c.  To be moved out in a
later patch series.

Bonus: the floppy type used in pc_cmos_init() now obviously matches
the one in the FDrive.  Before, we relied on
bdrv_get_floppy_geometry_hint() picking the same type both in
fd_revalidate() and in pc_cmos_init().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block.c
block.h
hw/fdc.c
hw/fdc.h
hw/pc.c