[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/16] block: Split bdrv_move_feature_fields()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 09/16] block: Split bdrv_move_feature_fields() |
Date: |
Thu, 1 Oct 2015 15:13:27 +0200 |
After bdrv_swap(), some fields must be moved back to their original BDS
to compensate for the effects that a swap of the contents of the objects
has while keeping the old addresses. Other fields must be moved back
because they should logically be moved and must stay on top
When replacing bdrv_swap() with operations changing the pointers in the
parents, we only need the latter and must avoid swapping the former.
Split the function accordingly.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/block.c b/block.c
index c4dcf81..f8e4631 100644
--- a/block.c
+++ b/block.c
@@ -1985,6 +1985,8 @@ static void bdrv_rebind(BlockDriverState *bs)
}
}
+/* Fields that need to stay with the top-level BDS, no matter whether the
+ * address of the top-level BDS stays the same or not. */
static void bdrv_move_feature_fields(BlockDriverState *bs_dest,
BlockDriverState *bs_src)
{
@@ -2020,7 +2022,13 @@ static void bdrv_move_feature_fields(BlockDriverState
*bs_dest,
/* dirty bitmap */
bs_dest->dirty_bitmaps = bs_src->dirty_bitmaps;
+}
+/* Fields that only need to be swapped if the contents of BDSes is swapped
+ * rather than pointers being changed in the parents. */
+static void bdrv_move_reference_fields(BlockDriverState *bs_dest,
+ BlockDriverState *bs_src)
+{
/* reference count */
bs_dest->refcnt = bs_src->refcnt;
@@ -2091,6 +2099,10 @@ void bdrv_swap(BlockDriverState *bs_new,
BlockDriverState *bs_old)
bdrv_move_feature_fields(bs_old, bs_new);
bdrv_move_feature_fields(bs_new, &tmp);
+ bdrv_move_reference_fields(&tmp, bs_old);
+ bdrv_move_reference_fields(bs_old, bs_new);
+ bdrv_move_reference_fields(bs_new, &tmp);
+
/* bs_new must remain unattached */
assert(!bs_new->blk);
--
1.8.3.1
- [Qemu-devel] [PATCH v2 16/16] block: Remove bdrv_swap(), (continued)
- [Qemu-devel] [PATCH v2 16/16] block: Remove bdrv_swap(), Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 08/16] block: Manage backing file references in bdrv_set_backing_hd(), Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 07/16] block: Convert bs->backing_hd to BdrvChild, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 09/16] block: Split bdrv_move_feature_fields(),
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 02/16] vmdk: Use BdrvChild instead of BDS for references to extents, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 04/16] quorum: Convert to BdrvChild, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 01/16] block: Introduce BDS.file_child, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 12/16] block: Introduce parents list, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 14/16] blockjob: Store device name at job creation, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 10/16] block/io: Make bdrv_requests_pending() public, Kevin Wolf, 2015/10/08
- [Qemu-devel] [PATCH v2 05/16] block: Convert bs->file to BdrvChild, Kevin Wolf, 2015/10/08