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 <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2013-07-05 13:48:01 +02:00
parent 7a370406bd
commit f0f0fdfeec
2 changed files with 9 additions and 3 deletions

10
block.c
View File

@ -2910,13 +2910,19 @@ int bdrv_get_flags(BlockDriverState *bs)
return bs->open_flags; return bs->open_flags;
} }
void bdrv_flush_all(void) int bdrv_flush_all(void)
{ {
BlockDriverState *bs; BlockDriverState *bs;
int result = 0;
QTAILQ_FOREACH(bs, &bdrv_states, list) { 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_1(BlockDriverState *bs) int bdrv_has_zero_init_1(BlockDriverState *bs)

View File

@ -267,7 +267,7 @@ void bdrv_clear_incoming_migration_all(void);
/* Ensure contents are flushed to disk. */ /* Ensure contents are flushed to disk. */
int bdrv_flush(BlockDriverState *bs); int bdrv_flush(BlockDriverState *bs);
int coroutine_fn bdrv_co_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_close_all(void);
void bdrv_drain_all(void); void bdrv_drain_all(void);