falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Remove bdrv_make_anon() 

The call in hmp_drive_del() is dead code because blk_remove_bs() is
called a few lines above. The only other remaining user is
bdrv_delete(), which only abuses bdrv_make_anon() to remove it from the
named nodes list. This path inlines the list entry removal into
bdrv_delete() and removes bdrv_make_anon().

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Kevin Wolf 2016-03-18 10:46:57 +01:00
parent 553934db66
commit 63eaaae08c
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block.c
View File

@ -2242,16 +2242,6 @@ void bdrv_close_all(void)
} }
} }
/* make a BlockDriverState anonymous by removing from graph_bdrv_state list.
* Also, NULL terminate the device_name to prevent double remove */
void bdrv_make_anon(BlockDriverState *bs)
{
if (bs->node_name[0] != '\0') {
QTAILQ_REMOVE(&graph_bdrv_states, bs, node_list);
}
bs->node_name[0] = '\0';
}
/* Fields that need to stay with the top-level BDS */ /* Fields that need to stay with the top-level BDS */
static void bdrv_move_feature_fields(BlockDriverState *bs_dest, static void bdrv_move_feature_fields(BlockDriverState *bs_dest,
BlockDriverState *bs_src) BlockDriverState *bs_src)
@ -2381,8 +2371,9 @@ static void bdrv_delete(BlockDriverState *bs)
bdrv_close(bs); bdrv_close(bs);
/* remove from list, if necessary */ /* remove from list, if necessary */
bdrv_make_anon(bs); if (bs->node_name[0] != '\0') {
QTAILQ_REMOVE(&graph_bdrv_states, bs, node_list);
}
QTAILQ_REMOVE(&all_bdrv_states, bs, bs_list); QTAILQ_REMOVE(&all_bdrv_states, bs, bs_list);
g_free(bs); g_free(bs);

3
blockdev.c
View File

@ -2869,9 +2869,6 @@ void hmp_drive_del(Monitor *mon, const QDict *qdict)
/* Make the BlockBackend and the attached BlockDriverState anonymous */ /* Make the BlockBackend and the attached BlockDriverState anonymous */
monitor_remove_blk(blk); monitor_remove_blk(blk);
if (blk_bs(blk)) {
bdrv_make_anon(blk_bs(blk));
}
/* If this BlockBackend has a device attached to it, its refcount will be /* If this BlockBackend has a device attached to it, its refcount will be
* decremented when the device is removed; otherwise we have to do so here. * decremented when the device is removed; otherwise we have to do so here.

1
include/block/block.h
View File

@ -201,7 +201,6 @@ int bdrv_create(BlockDriver *drv, const char* filename,
int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp); int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp);
BlockDriverState *bdrv_new_root(void); BlockDriverState *bdrv_new_root(void);
BlockDriverState *bdrv_new(void); BlockDriverState *bdrv_new(void);
void bdrv_make_anon(BlockDriverState *bs);
void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top); void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top);
void bdrv_replace_in_backing_chain(BlockDriverState *old, void bdrv_replace_in_backing_chain(BlockDriverState *old,
BlockDriverState *new); BlockDriverState *new);