From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoEli-00024y-PM for qemu-devel@nongnu.org; Mon, 09 Jul 2012 10:16:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoEld-00089c-Nr for qemu-devel@nongnu.org; Mon, 09 Jul 2012 10:16:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoEld-00089A-5Z for qemu-devel@nongnu.org; Mon, 09 Jul 2012 10:16:49 -0400 From: Kevin Wolf Date: Mon, 9 Jul 2012 16:16:17 +0200 Message-Id: <1341843388-5663-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1341843388-5663-1-git-send-email-kwolf@redhat.com> References: <1341843388-5663-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 14/25] blkdebug: optionally tie errors to a specific sector List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini This makes blkdebug scripts more powerful, and independent of the exact sequence of operations performed by streaming. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- block/blkdebug.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index d12ebbf..59dcea0 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -59,6 +59,7 @@ typedef struct BlkdebugRule { int error; int immediately; int once; + int64_t sector; } inject; struct { int new_state; @@ -85,6 +86,10 @@ static QemuOptsList inject_error_opts = { .type = QEMU_OPT_NUMBER, }, { + .name = "sector", + .type = QEMU_OPT_NUMBER, + }, + { .name = "once", .type = QEMU_OPT_BOOL, }, @@ -213,6 +218,7 @@ static int add_rule(QemuOpts *opts, void *opaque) rule->options.inject.once = qemu_opt_get_bool(opts, "once", 0); rule->options.inject.immediately = qemu_opt_get_bool(opts, "immediately", 0); + rule->options.inject.sector = qemu_opt_get_number(opts, "sector", -1); break; case ACTION_SET_STATE: @@ -343,7 +349,15 @@ static BlockDriverAIOCB *blkdebug_aio_readv(BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque) { BDRVBlkdebugState *s = bs->opaque; - BlkdebugRule *rule = QSIMPLEQ_FIRST(&s->active_rules); + BlkdebugRule *rule = NULL; + + QSIMPLEQ_FOREACH(rule, &s->active_rules, active_next) { + if (rule->options.inject.sector == -1 || + (rule->options.inject.sector >= sector_num && + rule->options.inject.sector < sector_num + nb_sectors)) { + break; + } + } if (rule && rule->options.inject.error) { return inject_error(bs, cb, opaque, rule); @@ -357,7 +371,15 @@ static BlockDriverAIOCB *blkdebug_aio_writev(BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque) { BDRVBlkdebugState *s = bs->opaque; - BlkdebugRule *rule = QSIMPLEQ_FIRST(&s->active_rules); + BlkdebugRule *rule = NULL; + + QSIMPLEQ_FOREACH(rule, &s->active_rules, active_next) { + if (rule->options.inject.sector == -1 || + (rule->options.inject.sector >= sector_num && + rule->options.inject.sector < sector_num + nb_sectors)) { + break; + } + } if (rule && rule->options.inject.error) { return inject_error(bs, cb, opaque, rule); -- 1.7.6.5