From: Alberto Garcia <berto@igalia.com>
Date: Mon, 12 Nov 2018 14:00:39 +0000 (+0200)
Subject: block: Use bdrv_reopen_set_read_only() in external_snapshot_commit()
X-Git-Tag: v4.0.0-rc0~208^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1b57774f79e6fb5e848149e0bf227e0534e9ade5;p=users%2Fdwmw2%2Fqemu.git

block: Use bdrv_reopen_set_read_only() in external_snapshot_commit()

This patch replaces the bdrv_reopen() call that set and remove the
BDRV_O_RDWR flag with the new bdrv_reopen_set_read_only() function.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/blockdev.c b/blockdev.c
index 6fa6969cd0..e6c8349409 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1703,8 +1703,7 @@ static void external_snapshot_commit(BlkActionState *common)
      * bdrv_reopen_multiple() across all the entries at once, because we
      * don't want to abort all of them if one of them fails the reopen */
     if (!atomic_read(&state->old_bs->copy_on_read)) {
-        bdrv_reopen(state->old_bs, state->old_bs->open_flags & ~BDRV_O_RDWR,
-                    NULL);
+        bdrv_reopen_set_read_only(state->old_bs, true, NULL);
     }
 
     aio_context_release(aio_context);