summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2013-07-05 13:48:01 +0200
committerKevin Wolf <kwolf@redhat.com>2013-07-15 09:51:27 +0200
commitf0f0fdfeec6c67ad374114ecc4b3e3ccde5e94d2 (patch)
tree2781e463bbaa569ac6a26948acef37e78ad1d3f9
parent7a370406bdd13b1d46230d1cbca308d984d0dcae (diff)
downloadfocaccia-qemu-f0f0fdfeec6c67ad374114ecc4b3e3ccde5e94d2.tar.gz
focaccia-qemu-f0f0fdfeec6c67ad374114ecc4b3e3ccde5e94d2.zip
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>
-rw-r--r--block.c10
-rw-r--r--include/block/block.h2
2 files changed, 9 insertions, 3 deletions
diff --git a/block.c b/block.c
index 2df65c88bf..b56024113b 100644
--- a/block.c
+++ b/block.c
@@ -2910,13 +2910,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_1(BlockDriverState *bs)
diff --git a/include/block/block.h b/include/block/block.h
index eeb48162af..b6b9014a9c 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -267,7 +267,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);