diff options
| author | Ekaterina Tumanova <tumanova@linux.vnet.ibm.com> | 2015-02-16 12:47:58 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-03-10 14:02:22 +0100 |
| commit | 0eb28a42284ec32e6f283985d2d638474a05eba4 (patch) | |
| tree | 922a82eb6b0aa19aabe1a21713814a9f0c79255c /hw/block/hd-geometry.c | |
| parent | f0272c4db2a914453a6254f80bfe3b708a0b2426 (diff) | |
| download | qemu-0eb28a42284ec32e6f283985d2d638474a05eba4.zip qemu-0eb28a42284ec32e6f283985d2d638474a05eba4.tar.gz qemu-0eb28a42284ec32e6f283985d2d638474a05eba4.tar.bz2 | |
BlockConf: Call backend functions to detect geometry and blocksizes
geometry: hd_geometry_guess function autodetects the drive geometry.
This patch adds a block backend call, that probes the backing device
geometry. If the inner driver method is implemented and succeeds
(currently only for DASDs), the blkconf_geometry will pass-through
the backing device geometry. Otherwise will fallback to old logic.
blocksize: This patch initializes blocksize properties to 0.
In order to set the property a blkconf_blocksizes was introduced.
If user didn't set physical or logical blocksize, it will
retrieve its value from a driver (only succeeds for DASD), otherwise
it will set default 512 value.
The blkconf_blocksizes call was added to all users of BlkConf.
Signed-off-by: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1424087278-49393-6-git-send-email-tumanova@linux.vnet.ibm.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/block/hd-geometry.c')
| -rw-r--r-- | hw/block/hd-geometry.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c index 6fcf74d..b187878 100644 --- a/hw/block/hd-geometry.c +++ b/hw/block/hd-geometry.c @@ -121,8 +121,16 @@ void hd_geometry_guess(BlockBackend *blk, int *ptrans) { int cylinders, heads, secs, translation; + HDGeometry geo; - if (guess_disk_lchs(blk, &cylinders, &heads, &secs) < 0) { + /* Try to probe the backing device geometry, otherwise fallback + to the old logic. (as of 12/2014 probing only succeeds on DASDs) */ + if (blk_probe_geometry(blk, &geo) == 0) { + *pcyls = geo.cylinders; + *psecs = geo.sectors; + *pheads = geo.heads; + translation = BIOS_ATA_TRANSLATION_NONE; + } else if (guess_disk_lchs(blk, &cylinders, &heads, &secs) < 0) { /* no LCHS guess: use a standard physical disk geometry */ guess_chs_for_size(blk, pcyls, pheads, psecs); translation = hd_bios_chs_auto_trans(*pcyls, *pheads, *psecs); |