diff options
author | Markus Armbruster <armbru@redhat.com> | 2012-07-11 15:08:39 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-17 16:48:32 +0200 |
commit | b7eb0c9f95e50239ce5b5266373dc52c85e75299 (patch) | |
tree | b82a0d11cbb8466b37c3684f2c873b78c52eef4b /hw/block-common.c | |
parent | 577d0a38070d1d6c4c7fab5c2054380770b1ec6b (diff) |
hw/block-common: Factor out fall back to legacy -drive cyls=...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/block-common.c')
-rw-r--r-- | hw/block-common.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/hw/block-common.c b/hw/block-common.c index 0a0542a650..f0196d78dc 100644 --- a/hw/block-common.c +++ b/hw/block-common.c @@ -9,6 +9,7 @@ #include "blockdev.h" #include "hw/block-common.h" +#include "qemu-error.h" void blkconf_serial(BlockConf *conf, char **serial) { @@ -22,3 +23,42 @@ void blkconf_serial(BlockConf *conf, char **serial) } } } + +int blkconf_geometry(BlockConf *conf, int *ptrans, + unsigned cyls_max, unsigned heads_max, unsigned secs_max) +{ + DriveInfo *dinfo; + + if (!conf->cyls && !conf->heads && !conf->secs) { + /* try to fall back to value set with legacy -drive cyls=... */ + dinfo = drive_get_by_blockdev(conf->bs); + conf->cyls = dinfo->cyls; + conf->heads = dinfo->heads; + conf->secs = dinfo->secs; + if (ptrans) { + *ptrans = dinfo->trans; + } + } + if (!conf->cyls && !conf->heads && !conf->secs) { + hd_geometry_guess(conf->bs, + &conf->cyls, &conf->heads, &conf->secs, + ptrans); + } else if (ptrans && *ptrans == BIOS_ATA_TRANSLATION_AUTO) { + *ptrans = hd_bios_chs_auto_trans(conf->cyls, conf->heads, conf->secs); + } + if (conf->cyls || conf->heads || conf->secs) { + if (conf->cyls < 1 || conf->cyls > cyls_max) { + error_report("cyls must be between 1 and %u", cyls_max); + return -1; + } + if (conf->heads < 1 || conf->heads > heads_max) { + error_report("heads must be between 1 and %u", heads_max); + return -1; + } + if (conf->secs < 1 || conf->secs > secs_max) { + error_report("secs must be between 1 and %u", secs_max); + return -1; + } + } + return 0; +} |