diff options
| author | Vladimir Sementsov-Ogievskiy | 2021-05-27 17:40:56 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2021-06-02 14:23:20 +0200 |
| commit | 260242a833d0cdfba5d9988169f2dc89946809a2 (patch) | |
| tree | 7af42d671f4f3aa153a1740e1a978a931bac7537 /block | |
| parent | block: drop BlockDriverState::read_only (diff) | |
| download | qemu-260242a833d0cdfba5d9988169f2dc89946809a2.tar.gz qemu-260242a833d0cdfba5d9988169f2dc89946809a2.tar.xz qemu-260242a833d0cdfba5d9988169f2dc89946809a2.zip | |
block: drop BlockBackendRootState::read_only
Instead of keeping additional boolean field, let's store the
information in BDRV_O_RDWR bit of BlockBackendRootState::open_flags.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210527154056.70294-4-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 21b834e9df..d1a33a2c8e 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1852,7 +1852,7 @@ bool blk_supports_write_perm(BlockBackend *blk) if (bs) { return !bdrv_is_read_only(bs); } else { - return !blk->root_state.read_only; + return blk->root_state.open_flags & BDRV_O_RDWR; } } @@ -2269,7 +2269,6 @@ void blk_update_root_state(BlockBackend *blk) assert(blk->root); blk->root_state.open_flags = blk->root->bs->open_flags; - blk->root_state.read_only = bdrv_is_read_only(blk->root->bs); blk->root_state.detect_zeroes = blk->root->bs->detect_zeroes; } @@ -2288,12 +2287,7 @@ bool blk_get_detect_zeroes_from_root_state(BlockBackend *blk) */ int blk_get_open_flags_from_root_state(BlockBackend *blk) { - int bs_flags; - - bs_flags = blk->root_state.read_only ? 0 : BDRV_O_RDWR; - bs_flags |= blk->root_state.open_flags & ~BDRV_O_RDWR; - - return bs_flags; + return blk->root_state.open_flags; } BlockBackendRootState *blk_get_root_state(BlockBackend *blk) |