From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4AE7-0007kh-Ds for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:16:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W4AE1-0006Ui-DN for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:16:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W4AE0-0006UU-Fo for qemu-devel@nongnu.org; Fri, 17 Jan 2014 09:16:44 -0500 From: Kevin Wolf Date: Fri, 17 Jan 2014 15:15:16 +0100 Message-Id: <1389968119-24771-27-git-send-email-kwolf@redhat.com> In-Reply-To: <1389968119-24771-1-git-send-email-kwolf@redhat.com> References: <1389968119-24771-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v3 26/29] blkdebug: Make required alignment configurable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pl@kamp.de, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, xiawenc@linux.vnet.ibm.com 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 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/block/blkdebug.c b/block/blkdebug.c index ebc5f13..dc4ba46 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -346,6 +346,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 */ } }, }; @@ -357,6 +362,7 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, QemuOpts *opts; Error *local_err = NULL; const char *filename, *config; + uint64_t align; int ret; opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); @@ -394,6 +400,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); -- 1.8.1.4