[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 34/85] block: refactor bdrv_reopen_commit
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 34/85] block: refactor bdrv_reopen_commit |
Date: |
Tue, 11 Jul 2017 18:07:23 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Add bs local variable to simplify code.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index b9e5114..15a4e75 100644
--- a/block.c
+++ b/block.c
@@ -2982,9 +2982,11 @@ error:
void bdrv_reopen_commit(BDRVReopenState *reopen_state)
{
BlockDriver *drv;
+ BlockDriverState *bs;
assert(reopen_state != NULL);
- drv = reopen_state->bs->drv;
+ bs = reopen_state->bs;
+ drv = bs->drv;
assert(drv != NULL);
/* If there are any driver level actions to take */
@@ -2993,13 +2995,13 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state)
}
/* set BDS specific flags now */
- QDECREF(reopen_state->bs->explicit_options);
+ QDECREF(bs->explicit_options);
- reopen_state->bs->explicit_options = reopen_state->explicit_options;
- reopen_state->bs->open_flags = reopen_state->flags;
- reopen_state->bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
+ bs->explicit_options = reopen_state->explicit_options;
+ bs->open_flags = reopen_state->flags;
+ bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);
- bdrv_refresh_limits(reopen_state->bs, NULL);
+ bdrv_refresh_limits(bs, NULL);
}
/*
--
2.9.4
- [Qemu-devel] [PULL 23/85] specs/qcow2: fix bitmap granularity qemu-specific note, (continued)
- [Qemu-devel] [PULL 23/85] specs/qcow2: fix bitmap granularity qemu-specific note, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 24/85] specs/qcow2: do not use wording 'bitmap header', Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 25/85] hbitmap: improve dirty iter, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 26/85] tests: add hbitmap iter test, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 27/85] block: fix bdrv_dirty_bitmap_granularity signature, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 28/85] block/dirty-bitmap: add deserialize_ones func, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 29/85] qcow2-refcount: rename inc_refcounts() and make it public, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 31/85] block/dirty-bitmap: fix comment for BlockDirtyBitmap.disabled field, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 30/85] qcow2: add bitmaps extension, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 32/85] block/dirty-bitmap: add readonly field to BdrvDirtyBitmap, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 34/85] block: refactor bdrv_reopen_commit,
Max Reitz <=
- [Qemu-devel] [PULL 33/85] qcow2: autoloading dirty bitmaps, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 35/85] block: new bdrv_reopen_bitmaps_rw interface, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 38/85] block: bdrv_close: release bitmaps after drv->bdrv_close, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 37/85] block/dirty-bitmap: add autoload field to BdrvDirtyBitmap, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 36/85] qcow2: support .bdrv_reopen_bitmaps_rw, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 39/85] block: introduce persistent dirty bitmaps, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 40/85] block/dirty-bitmap: add bdrv_dirty_bitmap_next(), Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 41/85] qcow2: add persistent dirty bitmaps support, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 42/85] qcow2: store bitmaps on reopening image as read-only, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 44/85] qcow2: add .bdrv_can_store_new_dirty_bitmap, Max Reitz, 2017/07/11