From 0073781fea140c31928802a8a112bf0acc31bb2d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 4 Aug 2014 17:11:02 -0400 Subject: [PATCH] blkdebug: report errors on flush too Signed-off-by: Paolo Bonzini Signed-off-by: John Snow Signed-off-by: Stefan Hajnoczi (cherry picked from commit 9e52c53b8c7821ce06e8b995b960e81b469e6847) *included to maintain parity with unit tests which inject errors via blkdebug. needed for: "qcow2: Flushing the caches in qcow2_close may fail" Signed-off-by: Michael Roth --- block/blkdebug.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/block/blkdebug.c b/block/blkdebug.c index 01b8e73bdae..dac76667303 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -526,6 +526,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) { @@ -703,6 +722,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, -- 2.39.5