diff options
| author | Alberto Garcia <berto@igalia.com> | 2018-11-12 16:00:36 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-12-14 11:55:01 +0100 |
| commit | c742a3643f113fe92cf904dd897fa03c2784d30d (patch) | |
| tree | 7479d0f5f9825431f7eac075449389aee4fe625e | |
| parent | e70cdc57daa5d5a16caf3e681ed2ec3522cd75ad (diff) | |
| download | qemu-c742a3643f113fe92cf904dd897fa03c2784d30d.zip qemu-c742a3643f113fe92cf904dd897fa03c2784d30d.tar.gz qemu-c742a3643f113fe92cf904dd897fa03c2784d30d.tar.bz2 | |
block: Use bdrv_reopen_set_read_only() in bdrv_commit()
This patch replaces the bdrv_reopen() calls 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>
| -rw-r--r-- | block/commit.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/block/commit.c b/block/commit.c index a53c2d0..53148e6 100644 --- a/block/commit.c +++ b/block/commit.c @@ -391,7 +391,7 @@ int bdrv_commit(BlockDriverState *bs) BlockDriverState *commit_top_bs = NULL; BlockDriver *drv = bs->drv; int64_t offset, length, backing_length; - int ro, open_flags; + int ro; int64_t n; int ret = 0; uint8_t *buf = NULL; @@ -410,10 +410,9 @@ int bdrv_commit(BlockDriverState *bs) } ro = bs->backing->bs->read_only; - open_flags = bs->backing->bs->open_flags; if (ro) { - if (bdrv_reopen(bs->backing->bs, open_flags | BDRV_O_RDWR, NULL)) { + if (bdrv_reopen_set_read_only(bs->backing->bs, false, NULL)) { return -EACCES; } } @@ -523,7 +522,7 @@ ro_cleanup: if (ro) { /* ignoring error return here */ - bdrv_reopen(bs->backing->bs, open_flags & ~BDRV_O_RDWR, NULL); + bdrv_reopen_set_read_only(bs->backing->bs, true, NULL); } return ret; |