[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 23/33] block: Drop child_backing
From: |
Max Reitz |
Subject: |
[PATCH v3 23/33] block: Drop child_backing |
Date: |
Tue, 18 Feb 2020 13:42:32 +0100 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block.c | 62 +++------------------------------------
include/block/block_int.h | 1 -
2 files changed, 4 insertions(+), 59 deletions(-)
diff --git a/block.c b/block.c
index 31affcb4ee..1f573f3815 100644
--- a/block.c
+++ b/block.c
@@ -1191,15 +1191,6 @@ static void bdrv_backing_attach(BdrvChild *c)
parent->backing_blocker);
}
-/* XXX: Will be removed along with child_backing */
-static void bdrv_child_cb_attach_backing(BdrvChild *c)
-{
- if (!(c->role & BDRV_CHILD_COW)) {
- bdrv_backing_attach(c);
- }
- bdrv_child_cb_attach(c);
-}
-
static void bdrv_backing_detach(BdrvChild *c)
{
BlockDriverState *parent = c->opaque;
@@ -1210,28 +1201,6 @@ static void bdrv_backing_detach(BdrvChild *c)
parent->backing_blocker = NULL;
}
-/* XXX: Will be removed along with child_backing */
-static void bdrv_child_cb_detach_backing(BdrvChild *c)
-{
- if (!(c->role & BDRV_CHILD_COW)) {
- bdrv_backing_detach(c);
- }
- bdrv_child_cb_detach(c);
-}
-
-/*
- * Returns the options and flags that bs->backing should get, based on the
- * given options and flags for the parent BDS
- */
-static void bdrv_backing_options(BdrvChildRole role, bool parent_is_format,
- int *child_flags, QDict *child_options,
- int parent_flags, QDict *parent_options)
-{
- bdrv_inherited_options(BDRV_CHILD_COW, true,
- child_flags, child_options,
- parent_flags, parent_options);
-}
-
static int bdrv_backing_update_filename(BdrvChild *c, BlockDriverState *base,
const char *filename, Error **errp)
{
@@ -1259,21 +1228,6 @@ static int bdrv_backing_update_filename(BdrvChild *c,
BlockDriverState *base,
return ret;
}
-const BdrvChildClass child_backing = {
- .parent_is_bds = true,
- .get_parent_desc = bdrv_child_get_parent_desc,
- .attach = bdrv_child_cb_attach_backing,
- .detach = bdrv_child_cb_detach_backing,
- .inherit_options = bdrv_backing_options,
- .drained_begin = bdrv_child_cb_drained_begin,
- .drained_poll = bdrv_child_cb_drained_poll,
- .drained_end = bdrv_child_cb_drained_end,
- .inactivate = bdrv_child_cb_inactivate,
- .update_filename = bdrv_backing_update_filename,
- .can_set_aio_ctx = bdrv_child_cb_can_set_aio_ctx,
- .set_aio_ctx = bdrv_child_cb_set_aio_ctx,
-};
-
static int bdrv_open_flags(BlockDriverState *bs, int flags)
{
int open_flags = flags;
@@ -2280,8 +2234,7 @@ static void
bdrv_default_perms_for_backing(BlockDriverState *bs, BdrvChild *c,
uint64_t perm, uint64_t shared,
uint64_t *nperm, uint64_t *nshared)
{
- assert(child_class == &child_backing ||
- (child_class == &child_of_bds && (role & BDRV_CHILD_COW)));
+ assert(child_class == &child_of_bds && (role & BDRV_CHILD_COW));
/*
* We want consistent read from backing files if the parent needs it.
@@ -2393,23 +2346,16 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
uint64_t perm, uint64_t shared,
uint64_t *nperm, uint64_t *nshared)
{
- bool backing = (child_class == &child_backing);
-
if (child_class == &child_of_bds) {
bdrv_default_perms(bs, c, child_class, role, reopen_queue,
perm, shared, nperm, nshared);
return;
}
- assert(child_class == &child_backing || child_class == &child_file);
+ assert(child_class == &child_file);
- if (!backing) {
- bdrv_default_perms_for_metadata(bs, c, child_class, role, reopen_queue,
- perm, shared, nperm, nshared);
- } else {
- bdrv_default_perms_for_backing(bs, c, child_class, role, reopen_queue,
- perm, shared, nperm, nshared);
- }
+ bdrv_default_perms_for_metadata(bs, c, child_class, role, reopen_queue,
+ perm, shared, nperm, nshared);
}
void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 75139a95ae..ab64a5ccea 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -742,7 +742,6 @@ struct BdrvChildClass {
extern const BdrvChildClass child_of_bds;
extern const BdrvChildClass child_file;
-extern const BdrvChildClass child_backing;
struct BdrvChild {
BlockDriverState *bs;
--
2.24.1
- [PATCH v3 13/33] block: Add child_of_bds, (continued)
- [PATCH v3 13/33] block: Add child_of_bds, Max Reitz, 2020/02/18
- [PATCH v3 14/33] block: Distinguish paths in *_format_default_perms, Max Reitz, 2020/02/18
- [PATCH v3 15/33] block: Pull out bdrv_default_perms_for_backing(), Max Reitz, 2020/02/18
- [PATCH v3 17/33] block: Split bdrv_default_perms_for_storage(), Max Reitz, 2020/02/18
- [PATCH v3 16/33] block: Pull out bdrv_default_perms_for_storage(), Max Reitz, 2020/02/18
- [PATCH v3 18/33] block: Add bdrv_default_perms(), Max Reitz, 2020/02/18
- [PATCH v3 19/33] raw-format: Split raw_read_options(), Max Reitz, 2020/02/18
- [PATCH v3 20/33] block: Switch child_format users to child_of_bds, Max Reitz, 2020/02/18
- [PATCH v3 21/33] block: Drop child_format, Max Reitz, 2020/02/18
- [PATCH v3 22/33] block: Make backing files child_of_bds children, Max Reitz, 2020/02/18
- [PATCH v3 23/33] block: Drop child_backing,
Max Reitz <=
- [PATCH v3 25/33] block: Make filter drivers use child_of_bds, Max Reitz, 2020/02/18
- [PATCH v3 24/33] block: Make format drivers use child_of_bds, Max Reitz, 2020/02/18
- [PATCH v3 26/33] block: Use child_of_bds in remaining places, Max Reitz, 2020/02/18
- [PATCH v3 27/33] tests: Use child_of_bds instead of child_file, Max Reitz, 2020/02/18
- [PATCH v3 29/33] block: Make bdrv_filter_default_perms() static, Max Reitz, 2020/02/18
- [PATCH v3 28/33] block: Use bdrv_default_perms(), Max Reitz, 2020/02/18
- [PATCH v3 30/33] block: Drop bdrv_format_default_perms(), Max Reitz, 2020/02/18
- [PATCH v3 31/33] block: Drop child_file, Max Reitz, 2020/02/18
- [PATCH v3 32/33] block: Pass BdrvChildRole in remaining cases, Max Reitz, 2020/02/18
- [PATCH v3 33/33] block: Drop @child_class from bdrv_child_perm(), Max Reitz, 2020/02/18