openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block: simplify bdrv_child_user_desc() 

All child classes have this callback. So, drop unreachable code.

Still add an assertion to bdrv_attach_child_common(), to early detect
bad classes.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210601075218.79249-6-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-06-01 10:52:17 +03:00 committed by Kevin Wolf
parent 8081f064e4
commit da261b69ae
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block.c
View File

@ -2026,11 +2026,7 @@ bool bdrv_is_writable(BlockDriverState *bs)
static char *bdrv_child_user_desc(BdrvChild *c) static char *bdrv_child_user_desc(BdrvChild *c)
{ {
if (c->klass->get_parent_desc) { return c->klass->get_parent_desc(c);
return c->klass->get_parent_desc(c);
}
return g_strdup("another user");
} }
static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b, Error **errp) static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b, Error **errp)
@ -2772,6 +2768,7 @@ static int bdrv_attach_child_common(BlockDriverState *child_bs,
assert(child); assert(child);
assert(*child == NULL); assert(*child == NULL);
assert(child_class->get_parent_desc);
new_child = g_new(BdrvChild, 1); new_child = g_new(BdrvChild, 1);
*new_child = (BdrvChild) { *new_child = (BdrvChild) {