ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Remove bdrv_move_feature_fields() 

bdrv_move_feature_fields() and swap_feature_fields() are empty now, they
can be removed.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2016-02-29 13:56:21 +01:00
parent 7ca7f0f6db
commit 08e83aabe4
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
block.c
View File

@ -2210,13 +2210,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, static void change_parent_backing_link(BlockDriverState *from,
BlockDriverState *to) BlockDriverState *to)
{ {
@ -2240,16 +2233,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 * Add new bs contents at the top of an image chain while the chain is
* live, while keeping required fields on the top layer. * live, while keeping required fields on the top layer.
@ -2273,9 +2256,6 @@ void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top)
bdrv_ref(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); change_parent_backing_link(bs_top, bs_new);
bdrv_set_backing_hd(bs_new, bs_top); bdrv_set_backing_hd(bs_new, bs_top);
bdrv_unref(bs_top); bdrv_unref(bs_top);
@ -2292,16 +2272,6 @@ void bdrv_replace_in_backing_chain(BlockDriverState *old, BlockDriverState *new)
bdrv_ref(old); 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_parent_backing_link(old, new);
/* Change backing files if a previously independent node is added to the /* Change backing files if a previously independent node is added to the