mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-28 05:50:37 +00:00
0eb28a4228
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>
92 lines
2.7 KiB
C
92 lines
2.7 KiB
C
/*
|
|
* Common code for block device models
|
|
*
|
|
* Copyright (C) 2012 Red Hat, Inc.
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or
|
|
* later. See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "sysemu/blockdev.h"
|
|
#include "sysemu/block-backend.h"
|
|
#include "hw/block/block.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
void blkconf_serial(BlockConf *conf, char **serial)
|
|
{
|
|
DriveInfo *dinfo;
|
|
|
|
if (!*serial) {
|
|
/* try to fall back to value set with legacy -drive serial=... */
|
|
dinfo = blk_legacy_dinfo(conf->blk);
|
|
if (dinfo) {
|
|
*serial = g_strdup(dinfo->serial);
|
|
}
|
|
}
|
|
}
|
|
|
|
void blkconf_blocksizes(BlockConf *conf)
|
|
{
|
|
BlockBackend *blk = conf->blk;
|
|
BlockSizes blocksizes;
|
|
int backend_ret;
|
|
|
|
backend_ret = blk_probe_blocksizes(blk, &blocksizes);
|
|
/* fill in detected values if they are not defined via qemu command line */
|
|
if (!conf->physical_block_size) {
|
|
if (!backend_ret) {
|
|
conf->physical_block_size = blocksizes.phys;
|
|
} else {
|
|
conf->physical_block_size = BDRV_SECTOR_SIZE;
|
|
}
|
|
}
|
|
if (!conf->logical_block_size) {
|
|
if (!backend_ret) {
|
|
conf->logical_block_size = blocksizes.log;
|
|
} else {
|
|
conf->logical_block_size = BDRV_SECTOR_SIZE;
|
|
}
|
|
}
|
|
}
|
|
|
|
void blkconf_geometry(BlockConf *conf, int *ptrans,
|
|
unsigned cyls_max, unsigned heads_max, unsigned secs_max,
|
|
Error **errp)
|
|
{
|
|
DriveInfo *dinfo;
|
|
|
|
if (!conf->cyls && !conf->heads && !conf->secs) {
|
|
/* try to fall back to value set with legacy -drive cyls=... */
|
|
dinfo = blk_legacy_dinfo(conf->blk);
|
|
if (dinfo) {
|
|
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->blk,
|
|
&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_setg(errp, "cyls must be between 1 and %u", cyls_max);
|
|
return;
|
|
}
|
|
if (conf->heads < 1 || conf->heads > heads_max) {
|
|
error_setg(errp, "heads must be between 1 and %u", heads_max);
|
|
return;
|
|
}
|
|
if (conf->secs < 1 || conf->secs > secs_max) {
|
|
error_setg(errp, "secs must be between 1 and %u", secs_max);
|
|
return;
|
|
}
|
|
}
|
|
}
|