diff options
| -rw-r--r-- | hw/hd-geometry.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index fb849a3e12..241aed9352 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -132,6 +132,8 @@ void hd_geometry_guess(BlockDriverState *bs, return; } + assert(translation == BIOS_ATA_TRANSLATION_AUTO); + if (guess_disk_lchs(bs, &cylinders, &heads, &secs) < 0) { /* no LCHS guess: use a standard physical disk geometry */ guess_chs_for_size(bs, pcyls, pheads, psecs); @@ -140,12 +142,10 @@ void hd_geometry_guess(BlockDriverState *bs, translation was active, so a standard physical disk geometry is OK */ guess_chs_for_size(bs, pcyls, pheads, psecs); - if (translation == BIOS_ATA_TRANSLATION_AUTO) { - bdrv_set_translation_hint(bs, - *pcyls * *pheads <= 131072 - ? BIOS_ATA_TRANSLATION_LARGE - : BIOS_ATA_TRANSLATION_LBA); - } + bdrv_set_translation_hint(bs, + *pcyls * *pheads <= 131072 + ? BIOS_ATA_TRANSLATION_LARGE + : BIOS_ATA_TRANSLATION_LBA); } else { /* LCHS guess with heads <= 16: use as physical geometry */ *pcyls = cylinders; @@ -153,10 +153,7 @@ void hd_geometry_guess(BlockDriverState *bs, *psecs = secs; /* disable any translation to be in sync with the logical geometry */ - if (translation == BIOS_ATA_TRANSLATION_AUTO) { - bdrv_set_translation_hint(bs, - BIOS_ATA_TRANSLATION_NONE); - } + bdrv_set_translation_hint(bs, BIOS_ATA_TRANSLATION_NONE); } bdrv_set_geometry_hint(bs, *pcyls, *pheads, *psecs); trace_hd_geometry_guess(bs, *pcyls, *pheads, *psecs, translation); |