From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kWJ-0005Rf-Oj for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:26:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6kWD-0000VL-Py for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:26:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6kWD-0000V8-Hl for qemu-devel@nongnu.org; Fri, 24 Jan 2014 12:26:13 -0500 From: Kevin Wolf Date: Fri, 24 Jan 2014 18:22:13 +0100 Message-Id: <1390584136-24703-91-git-send-email-kwolf@redhat.com> In-Reply-To: <1390584136-24703-1-git-send-email-kwolf@redhat.com> References: <1390584136-24703-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 90/93] blkdebug: Make required alignment configurable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 --- block/blkdebug.c | 16 ++++++++++++++++ qapi-schema.json | 3 +++ 2 files changed, 19 insertions(+) diff --git a/block/blkdebug.c b/block/blkdebug.c index c8f8d56..2c03698 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 1ff607a..05ced9d 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'] } } -- 1.8.1.4