diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-06-01 10:52:17 +0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-06-02 14:23:20 +0200 |
| commit | da261b69aee9acb46ac1b0ebfe0ccb7b74450a88 (patch) | |
| tree | eab32ff1ce79715907010af7e560fbb0d066fea0 | |
| parent | 8081f064e404dd524b3c43248b2084dee9d32d7c (diff) | |
| download | focaccia-qemu-da261b69aee9acb46ac1b0ebfe0ccb7b74450a88.tar.gz focaccia-qemu-da261b69aee9acb46ac1b0ebfe0ccb7b74450a88.zip | |
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>
| -rw-r--r-- | block.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/block.c b/block.c index 94cb7b6637..3c0c3964ec 100644 --- a/block.c +++ b/block.c @@ -2026,11 +2026,7 @@ bool bdrv_is_writable(BlockDriverState *bs) static char *bdrv_child_user_desc(BdrvChild *c) { - if (c->klass->get_parent_desc) { - return c->klass->get_parent_desc(c); - } - - return g_strdup("another user"); + return c->klass->get_parent_desc(c); } 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 == NULL); + assert(child_class->get_parent_desc); new_child = g_new(BdrvChild, 1); *new_child = (BdrvChild) { |