From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vapv6-0007Nd-S4 for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vapuy-0000Lt-Dc for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:00 -0400 Received: from mail-qa0-x22f.google.com ([2607:f8b0:400d:c00::22f]:54974) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vapuy-0000Lp-99 for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:43:52 -0400 Received: by mail-qa0-f47.google.com with SMTP id k15so2235644qaq.13 for ; Mon, 28 Oct 2013 09:43:51 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 28 Oct 2013 17:43:17 +0100 Message-Id: <1382978620-16641-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> References: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 01/24] blkdebug: report errors on flush too List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- block/blkdebug.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/block/blkdebug.c b/block/blkdebug.c index 16d2b91..4626c43 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -484,6 +484,25 @@ static BlockDriverAIOCB *blkdebug_aio_writev(BlockDriverState *bs, return bdrv_aio_writev(bs->file, sector_num, qiov, nb_sectors, cb, opaque); } +static BlockDriverAIOCB *blkdebug_aio_flush(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque) +{ + BDRVBlkdebugState *s = bs->opaque; + BlkdebugRule *rule = NULL; + + QSIMPLEQ_FOREACH(rule, &s->active_rules, active_next) { + if (rule->options.inject.sector == -1) { + break; + } + } + + if (rule && rule->options.inject.error) { + return inject_error(bs, cb, opaque, rule); + } + + return bdrv_aio_flush(bs->file, cb, opaque); +} + static void blkdebug_close(BlockDriverState *bs) { @@ -636,6 +655,7 @@ static BlockDriver bdrv_blkdebug = { .bdrv_aio_readv = blkdebug_aio_readv, .bdrv_aio_writev = blkdebug_aio_writev, + .bdrv_aio_flush = blkdebug_aio_flush, .bdrv_debug_event = blkdebug_debug_event, .bdrv_debug_breakpoint = blkdebug_debug_breakpoint, -- 1.8.3.1