aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2014-01-14 13:44:35 +0100
committerKevin Wolf <kwolf@redhat.com>2014-01-24 17:40:03 +0100
commitb35ee7fb2308e09092488029b5a9e456ce61bbe6 (patch)
tree06b2cac578d683ea9d5874169d957d1ee3a4737d
parent2c9880c45e2f9a98d11d44ce9966515c23870a86 (diff)
downloadqemu-arm-b35ee7fb2308e09092488029b5a9e456ce61bbe6.tar.gz
blkdebug: Make required alignment configurable
The new 'align' option of blkdebug can be used in order to emulate backends with a required 4k alignment on hosts which only really require 512 byte alignment. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/blkdebug.c16
-rw-r--r--qapi-schema.json3
2 files changed, 19 insertions, 0 deletions
diff --git a/block/blkdebug.c b/block/blkdebug.c
index c8f8d56758..2c03698f93 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -364,6 +364,11 @@ static QemuOptsList runtime_opts = {
.type = QEMU_OPT_STRING,
.help = "[internal use only, will be removed]",
},
+ {
+ .name = "align",
+ .type = QEMU_OPT_SIZE,
+ .help = "Required alignment in bytes",
+ },
{ /* end of list */ }
},
};
@@ -375,6 +380,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
QemuOpts *opts;
Error *local_err = NULL;
const char *config;
+ uint64_t align;
int ret;
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
@@ -403,6 +409,16 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags,
goto fail;
}
+ /* Set request alignment */
+ align = qemu_opt_get_size(opts, "align", bs->request_alignment);
+ if (align > 0 && align < INT_MAX && !(align & (align - 1))) {
+ bs->request_alignment = align;
+ } else {
+ error_setg(errp, "Invalid alignment");
+ ret = -EINVAL;
+ goto fail;
+ }
+
ret = 0;
fail:
qemu_opts_del(opts);
diff --git a/qapi-schema.json b/qapi-schema.json
index 1ff607ac3c..05ced9d572 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4321,6 +4321,8 @@
#
# @config: #optional filename of the configuration file
#
+# @align: #optional required alignment for requests in bytes
+#
# @inject-error: #optional array of error injection descriptions
#
# @set-state: #optional array of state-change descriptions
@@ -4330,6 +4332,7 @@
{ 'type': 'BlockdevOptionsBlkdebug',
'data': { 'image': 'BlockdevRef',
'*config': 'str',
+ '*align': 'int',
'*inject-error': ['BlkdebugInjectErrorOptions'],
'*set-state': ['BlkdebugSetStateOptions'] } }