Commit 140fd5a6 authored Dec 22, 2015 by Kevin Wolf

qcow2: Fix BDRV_O_INACTIVE handling in qcow2_invalidate_cache()



What qcow2_invalidate_cache() should do is close the image with
BDRV_O_INACTIVE set and reopen it with the flag cleared. In fact, it
used to do exactly the opposite: qcow2_close() relied on bs->open_flags,
which is already updated to have cleared BDRV_O_INACTIVE at this point,
whereas qcow2_open() was called with s->flags, which has the flag still
set. Fix this.

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

parent ec6d8912

block/qcow2.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1719,7 +1719,7 @@ static void qcow2_close(BlockDriverState *bs)
		/* else pre-write overlap checks in cache_destroy may crash */
		s->l1_table = NULL;

		if (!(bs->open_flags & BDRV_O_INACTIVE)) {
		if (!(s->flags & BDRV_O_INACTIVE)) {
		qcow2_inactivate(bs);
		}

		@@ -1770,6 +1770,7 @@ static void qcow2_invalidate_cache(BlockDriverState bs, Error *errp)
		memset(s, 0, sizeof(BDRVQcow2State));
		options = qdict_clone_shallow(bs->options);

		flags &= ~BDRV_O_INACTIVE;
		ret = qcow2_open(bs, options, flags, &local_err);
		QDECREF(options);
		if (local_err) {