diff options
| author | Roman Kagan | 2020-05-29 00:55:10 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2020-06-17 14:53:40 +0200 |
| commit | c56ee92fcba8cc922b1b2188ac20614d20223db2 (patch) | |
| tree | 5790ad5e71f651f85db76f612e39d2270b6510c3 /hw/ide | |
| parent | virtio-blk: store opt_io_size with correct size (diff) | |
| download | qemu-c56ee92fcba8cc922b1b2188ac20614d20223db2.tar.gz qemu-c56ee92fcba8cc922b1b2188ac20614d20223db2.tar.xz qemu-c56ee92fcba8cc922b1b2188ac20614d20223db2.zip | |
block: consolidate blocksize properties consistency checks
Several block device properties related to blocksize configuration must
be in certain relationship WRT each other: physical block must be no
smaller than logical block; min_io_size, opt_io_size, and
discard_granularity must be a multiple of a logical block.
To ensure these requirements are met, add corresponding consistency
checks to blkconf_blocksizes, adjusting its signature to communicate
possible error to the caller. Also remove the now redundant consistency
checks from the specific devices.
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Message-Id: <20200528225516.1676602-3-rvkagan@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/qdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index caa88526f5..3ccb5e2529 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -187,7 +187,10 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp) return; } - blkconf_blocksizes(&dev->conf); + if (!blkconf_blocksizes(&dev->conf, errp)) { + return; + } + if (dev->conf.logical_block_size != 512) { error_setg(errp, "logical_block_size must be 512 for IDE"); return; |