[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 5/6] block: simplify bdrv_child_user_desc()
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 5/6] block: simplify bdrv_child_user_desc() |
Date: |
Tue, 1 Jun 2021 10:52:17 +0300 |
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>
---
block.c | 7 ++-----
1 file 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) {
--
2.29.2
- [PATCH v3 0/6] block permission updated follow-up, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 3/6] block: improve bdrv_child_get_parent_desc(), Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 1/6] block: document child argument of bdrv_attach_child_common(), Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 6/6] block: improve permission conflict error message, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 4/6] block/vvfat: inherit child_vvfat_qcow from child_of_bds, Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 2/6] block-backend: improve blk_root_get_parent_desc(), Vladimir Sementsov-Ogievskiy, 2021/06/01
- [PATCH v3 5/6] block: simplify bdrv_child_user_desc(),
Vladimir Sementsov-Ogievskiy <=
- Re: [PATCH v3 0/6] block permission updated follow-up, Kevin Wolf, 2021/06/01