[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 21/33] block: Drop child_format
From: |
Max Reitz |
Subject: |
[PATCH v2 21/33] block: Drop child_format |
Date: |
Tue, 4 Feb 2020 18:08:36 +0100 |
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 29 -----------------------------
include/block/block_int.h | 1 -
2 files changed, 30 deletions(-)
diff --git a/block.c b/block.c
index 994a037730..77755f0c6c 100644
--- a/block.c
+++ b/block.c
@@ -1126,35 +1126,6 @@ const BdrvChildClass child_file = {
.set_aio_ctx = bdrv_child_cb_set_aio_ctx,
};
-/*
- * Returns the options and flags that bs->file should get if the use of formats
- * (and not only protocols) is permitted for it, based on the given options and
- * flags for the parent BDS
- */
-static void bdrv_inherited_fmt_options(BdrvChildRole role,
- bool parent_is_format,
- int *child_flags, QDict *child_options,
- int parent_flags, QDict *parent_options)
-{
- bdrv_inherited_options(BDRV_CHILD_DATA, false,
- child_flags, child_options,
- parent_flags, parent_options);
-}
-
-const BdrvChildClass child_format = {
- .parent_is_bds = true,
- .get_parent_desc = bdrv_child_get_parent_desc,
- .inherit_options = bdrv_inherited_fmt_options,
- .drained_begin = bdrv_child_cb_drained_begin,
- .drained_poll = bdrv_child_cb_drained_poll,
- .drained_end = bdrv_child_cb_drained_end,
- .attach = bdrv_child_cb_attach,
- .detach = bdrv_child_cb_detach,
- .inactivate = bdrv_child_cb_inactivate,
- .can_set_aio_ctx = bdrv_child_cb_can_set_aio_ctx,
- .set_aio_ctx = bdrv_child_cb_set_aio_ctx,
-};
-
static void bdrv_backing_attach(BdrvChild *c)
{
BlockDriverState *parent = c->opaque;
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 35113ab878..21ece88d41 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_format;
extern const BdrvChildClass child_backing;
struct BdrvChild {
--
2.24.1
- Re: [PATCH v2 18/33] block: Add bdrv_default_perms(), (continued)
- [PATCH v2 17/33] block: Split bdrv_default_perms_for_storage(), Max Reitz, 2020/02/04
- [PATCH v2 16/33] block: Pull out bdrv_default_perms_for_storage(), Max Reitz, 2020/02/04
- [PATCH v2 19/33] raw-format: Split raw_read_options(), Max Reitz, 2020/02/04
- [PATCH v2 20/33] block: Switch child_format users to child_of_bds, Max Reitz, 2020/02/04
- [PATCH v2 21/33] block: Drop child_format,
Max Reitz <=
- [PATCH v2 22/33] block: Make backing files child_of_bds children, Max Reitz, 2020/02/04
- [PATCH v2 23/33] block: Drop child_backing, Max Reitz, 2020/02/04
- [PATCH v2 24/33] block: Make format drivers use child_of_bds, Max Reitz, 2020/02/04
- [PATCH v2 25/33] block: Make filter drivers use child_of_bds, Max Reitz, 2020/02/04