From dc28c0cd30d7b122500b17eedc7e070624fd7c86 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 10 Jul 2012 11:12:36 +0200 Subject: [PATCH] hd-geometry: Clean up confusing use of prior translation hint When hd_geometry_guess() picks a geometry, it also picks the appropriate translation, but only when the prior translation hint is BIOS_ATA_TRANSLATION_AUTO. Looks wrong, because such a prior translation would be passed to the BIOS whether it's suitable for the geometry or not. Fortunately, that can't happen. There are just two ways for the translation hint to get set to something other than BIOS_ATA_TRANSLATION_AUTO: drive_init() on behalf of -drive trans=..., and hd_geometry_guess(). Both set it only when they also set a valid geometry hint, i.e. one with a non-zero number of cylinders. Since hd_geometry_guess() returns right away when it finds a valid geometry hint, translation can only be BIOS_ATA_TRANSLATION_AUTO in the remainder of the function. Assert this, and simplify accordingly. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/hd-geometry.c | 17 +++++++---------- 1 file 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); -- GitLab