From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GGy-0005gI-6b for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9GGm-000424-Mi for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:12:36 -0400 Sender: fluxion From: Michael Roth Date: Tue, 13 Aug 2013 10:10:56 -0500 Message-Id: <1376406680-16302-33-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 32/56] block: Add return value for bdrv_flush_all() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org From: Kevin Wolf 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 c7c3e06..d338a20 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 1251c5c..4bc51d5 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); -- 1.7.9.5