From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 16 Dec 2015 15:05:21 +0000 (+0100)
Subject: block: Fix error path in bdrv_invalidate_cache()
X-Git-Tag: v2.6.0-rc0~211^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23c88b24721ee907639705bf9de03dcd6b1e66ad;p=thirdparty%2Fqemu.git

block: Fix error path in bdrv_invalidate_cache()

We can only clear BDRV_O_INCOMING if the caches were actually
invalidated.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/block.c b/block.c
index 1a137167d94..6ac3191e085 100644
--- a/block.c
+++ b/block.c
@@ -3272,12 +3272,14 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)
         bdrv_invalidate_cache(bs->file->bs, &local_err);
     }
     if (local_err) {
+        bs->open_flags |= BDRV_O_INCOMING;
         error_propagate(errp, local_err);
         return;
     }
 
     ret = refresh_total_sectors(bs, bs->total_sectors);
     if (ret < 0) {
+        bs->open_flags |= BDRV_O_INCOMING;
         error_setg_errno(errp, -ret, "Could not refresh total sector count");
         return;
     }