[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/9] block: Remove bdrv_move_feature_fields()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 6/9] block: Remove bdrv_move_feature_fields() |
Date: |
Tue, 22 Mar 2016 20:36:34 +0100 |
bdrv_move_feature_fields() and swap_feature_fields() are empty now, they
can be removed.
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/block.c b/block.c
index 66f918e..3770fb0 100644
--- a/block.c
+++ b/block.c
@@ -2222,13 +2222,6 @@ void bdrv_close_all(void)
}
}
-/* Fields that need to stay with the top-level BDS */
-static void bdrv_move_feature_fields(BlockDriverState *bs_dest,
- BlockDriverState *bs_src)
-{
- /* move some fields that need to stay attached to the device */
-}
-
static void change_parent_backing_link(BlockDriverState *from,
BlockDriverState *to)
{
@@ -2252,16 +2245,6 @@ static void change_parent_backing_link(BlockDriverState
*from,
}
}
-static void swap_feature_fields(BlockDriverState *bs_top,
- BlockDriverState *bs_new)
-{
- BlockDriverState tmp;
-
- bdrv_move_feature_fields(&tmp, bs_top);
- bdrv_move_feature_fields(bs_top, bs_new);
- bdrv_move_feature_fields(bs_new, &tmp);
-}
-
/*
* Add new bs contents at the top of an image chain while the chain is
* live, while keeping required fields on the top layer.
@@ -2285,9 +2268,6 @@ void bdrv_append(BlockDriverState *bs_new,
BlockDriverState *bs_top)
bdrv_ref(bs_top);
- /* Some fields always stay on top of the backing file chain */
- swap_feature_fields(bs_top, bs_new);
-
change_parent_backing_link(bs_top, bs_new);
bdrv_set_backing_hd(bs_new, bs_top);
bdrv_unref(bs_top);
@@ -2304,16 +2284,6 @@ void bdrv_replace_in_backing_chain(BlockDriverState
*old, BlockDriverState *new)
bdrv_ref(old);
- if (old->blk) {
- /* As long as these fields aren't in BlockBackend, but in the top-level
- * BlockDriverState, it's not possible for a BDS to have two BBs.
- *
- * We really want to copy the fields from old to new, but we go for a
- * swap instead so that pointers aren't duplicated and cause trouble.
- * (Also, bdrv_swap() used to do the same.) */
- assert(!new->blk);
- swap_feature_fields(old, new);
- }
change_parent_backing_link(old, new);
/* Change backing files if a previously independent node is added to the
--
1.8.3.1
- [Qemu-devel] [PATCH 0/9] block: Remove BlockDriverState.blk, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 2/9] block: User BdrvChild callback for device name, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 1/9] block: Use BdrvChild callbacks for change_media/resize, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 5/9] block: Avoid BDS.blk in bdrv_next(), Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 6/9] block: Remove bdrv_move_feature_fields(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 3/9] block jobs: Use BdrvChild callbacks for iostatus operations, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 8/9] block: Don't return throttling info in query-named-block-nodes, Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 7/9] block: Avoid bs->blk in bdrv_next(), Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 4/9] block: Remove bdrv_aio_multiwrite(), Kevin Wolf, 2016/03/22
- [Qemu-devel] [PATCH 9/9] block: Remove BlockDriverState.blk, Kevin Wolf, 2016/03/22