diff options
| author | Markus Armbruster <armbru@redhat.com> | 2012-07-10 11:12:34 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-17 16:48:30 +0200 |
| commit | 2fa5008ffd49e51540756adccf966a2fcde6e6c1 (patch) | |
| tree | bb48c6ab5aa6fa105d38e182de661213c9646bdb | |
| parent | c06aaf018b1a39b62c1f6867794807dd5705b355 (diff) | |
hd-geometry: Factor out guess_chs_for_size()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/hd-geometry.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index db47846782..1a58894cf0 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -97,14 +97,31 @@ static int guess_disk_lchs(BlockDriverState *bs, return -1; } +static void guess_chs_for_size(BlockDriverState *bs, + int *pcyls, int *pheads, int *psecs) +{ + uint64_t nb_sectors; + int cylinders; + + bdrv_get_geometry(bs, &nb_sectors); + + cylinders = nb_sectors / (16 * 63); + if (cylinders > 16383) { + cylinders = 16383; + } else if (cylinders < 2) { + cylinders = 2; + } + *pcyls = cylinders; + *pheads = 16; + *psecs = 63; +} + void hd_geometry_guess(BlockDriverState *bs, int *pcyls, int *pheads, int *psecs) { int translation, lba_detected = 0; int cylinders, heads, secs; - uint64_t nb_sectors; - bdrv_get_geometry(bs, &nb_sectors); bdrv_get_geometry_hint(bs, &cylinders, &heads, &secs); translation = bdrv_get_translation_hint(bs); @@ -119,16 +136,7 @@ void hd_geometry_guess(BlockDriverState *bs, if (guess_disk_lchs(bs, &cylinders, &heads, &secs) < 0) { /* no LCHS guess: use a standard physical disk geometry */ default_geometry: - cylinders = nb_sectors / (16 * 63); - - if (cylinders > 16383) { - cylinders = 16383; - } else if (cylinders < 2) { - cylinders = 2; - } - *pcyls = cylinders; - *pheads = 16; - *psecs = 63; + guess_chs_for_size(bs, pcyls, pheads, psecs); if ((lba_detected == 1) && (translation == BIOS_ATA_TRANSLATION_AUTO)) { if ((*pcyls * *pheads) <= 131072) { bdrv_set_translation_hint(bs, |