fdc: Drop broken code for user-defined floppy geometry
authorMarkus Armbruster <armbru@redhat.com>
Fri, 29 Jun 2012 15:34:23 +0000 (17:34 +0200)
committerKevin Wolf <kwolf@redhat.com>
Mon, 9 Jul 2012 13:53:03 +0000 (15:53 +0200)
commit1f69c2b022710222ff0379678e49f8bfb6c91233
tree2bacd730b0a805215b2315937accd465d04762a0
parentb3ce604eeaa77970fa53838e7df2bc85344f2554
fdc: Drop broken code for user-defined floppy geometry

bdrv_get_floppy_geometry_hint() fails to store through its parameter
drive when bs has a geometry hint.  Makes fd_revalidate() assign
random crap to drv->drive.

Has been broken that way for ages.  Harmless, because:

* The only way to set a geometry hint is -drive if=none,cyls=...
  Since commit c219331e, probably unintentional.

* The only use of drv->drive is as argument to another
  bdrv_get_floppy_geometry_hint().  Which doesn't use it, since the
  geometry hint is still there.

Drop the broken code, ignore -drive parameter cyls, heads and secs for
floppies even with if=none, just like before commit c219331e.  Matches
-help, which explains cyls, heads, secs as "hard disk physical
geometry".

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