From f8238453095565838c697ef2df38d291fe4e147a Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 5 Jul 2013 13:48:01 +0200 Subject: block: Add return value for bdrv_flush_all() bdrv_flush() can fail, and bdrv_flush_all() should return an error as well if this happens for a block device. It returns the first error return now, but still at least tries to flush the remaining devices even in error cases. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi (cherry picked from commit f0f0fdfeec6c67ad374114ecc4b3e3ccde5e94d2) Signed-off-by: Michael Roth --- block.c | 10 ++++++++-- include/block/block.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index c7c3e06f83..d338a20d10 100644 --- a/block.c +++ b/block.c @@ -2907,13 +2907,19 @@ int bdrv_get_flags(BlockDriverState *bs) return bs->open_flags; } -void bdrv_flush_all(void) +int bdrv_flush_all(void) { BlockDriverState *bs; + int result = 0; QTAILQ_FOREACH(bs, &bdrv_states, list) { - bdrv_flush(bs); + int ret = bdrv_flush(bs); + if (ret < 0 && !result) { + result = ret; + } } + + return result; } int bdrv_has_zero_init(BlockDriverState *bs) diff --git a/include/block/block.h b/include/block/block.h index 1251c5cf9f..4bc51d533b 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -276,7 +276,7 @@ void bdrv_clear_incoming_migration_all(void); /* Ensure contents are flushed to disk. */ int bdrv_flush(BlockDriverState *bs); int coroutine_fn bdrv_co_flush(BlockDriverState *bs); -void bdrv_flush_all(void); +int bdrv_flush_all(void); void bdrv_close_all(void); void bdrv_drain_all(void); -- cgit v1.2.1