From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH v4 31/34] block: Drop bdrv_format_default_perms()
Date: Wed, 13 May 2020 13:05:41 +0200 [thread overview]
Message-ID: <20200513110544.176672-32-mreitz@redhat.com> (raw)
In-Reply-To: <20200513110544.176672-1-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
include/block/block_int.h | 11 -----------
block.c | 19 -------------------
2 files changed, 30 deletions(-)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 6fc5f0d333..e791c40496 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -1262,17 +1262,6 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,
*/
int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp);
-/* Default implementation for BlockDriver.bdrv_child_perm() that can be used by
- * (non-raw) image formats: Like above for bs->backing, but for bs->file it
- * requires WRITE | RESIZE for read-write images, always requires
- * CONSISTENT_READ and doesn't share WRITE. */
-void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,
- const BdrvChildClass *child_class,
- BdrvChildRole child_role,
- BlockReopenQueue *reopen_queue,
- uint64_t perm, uint64_t shared,
- uint64_t *nperm, uint64_t *nshared);
-
bool bdrv_recurse_can_replace(BlockDriverState *bs,
BlockDriverState *to_replace);
diff --git a/block.c b/block.c
index 54bc1c3b2d..e79fe6e07e 100644
--- a/block.c
+++ b/block.c
@@ -2517,25 +2517,6 @@ static void bdrv_default_perms_for_storage(BlockDriverState *bs, BdrvChild *c,
*nshared = shared;
}
-void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,
- const BdrvChildClass *child_class,
- BdrvChildRole role,
- BlockReopenQueue *reopen_queue,
- uint64_t perm, uint64_t shared,
- uint64_t *nperm, uint64_t *nshared)
-{
- 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_file);
-
- bdrv_default_perms_for_storage(bs, c, child_class, role, reopen_queue,
- perm, shared, nperm, nshared);
-}
-
void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c,
const BdrvChildClass *child_class, BdrvChildRole role,
BlockReopenQueue *reopen_queue,
--
2.26.2
next prev parent reply other threads:[~2020-05-13 11:26 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 11:05 [PATCH v4 00/34] block: Introduce real BdrvChildRole Max Reitz
2020-05-13 11:05 ` [PATCH v4 01/34] block: Mark commit, mirror, blkreplay as filters Max Reitz
2020-05-13 11:05 ` [PATCH v4 02/34] block: Add BlockDriver.is_format Max Reitz
2020-05-13 11:05 ` [PATCH v4 03/34] block: Rename BdrvChildRole to BdrvChildClass Max Reitz
2020-05-13 11:05 ` [PATCH v4 04/34] block: Add BdrvChildRole and BdrvChildRoleBits Max Reitz
2020-05-13 17:36 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 05/34] block: Add BdrvChildRole to BdrvChild Max Reitz
2020-05-13 11:05 ` [PATCH v4 06/34] block: Pass BdrvChildRole to bdrv_child_perm() Max Reitz
2020-05-13 11:05 ` [PATCH v4 07/34] block: Pass BdrvChildRole to .inherit_options() Max Reitz
2020-05-13 11:05 ` [PATCH v4 08/34] block: Pass parent_is_format " Max Reitz
2020-05-13 11:05 ` [PATCH v4 09/34] block: Rename bdrv_inherited_options() Max Reitz
2020-05-13 11:05 ` [PATCH v4 10/34] block: Add generic bdrv_inherited_options() Max Reitz
2020-05-13 20:13 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 11/34] block: Use bdrv_inherited_options() Max Reitz
2020-05-13 20:18 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 12/34] block: Unify bdrv_child_cb_attach() Max Reitz
2020-05-13 20:26 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 13/34] block: Unify bdrv_child_cb_detach() Max Reitz
2020-05-13 20:27 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 14/34] block: Add child_of_bds Max Reitz
2020-05-13 20:29 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 15/34] block: Distinguish paths in *_format_default_perms Max Reitz
2020-05-13 20:30 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 16/34] block: Pull out bdrv_default_perms_for_cow() Max Reitz
2020-05-13 20:33 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 17/34] block: Pull out bdrv_default_perms_for_storage() Max Reitz
2020-05-13 11:05 ` [PATCH v4 18/34] block: Relax *perms_for_storage for data children Max Reitz
2020-05-13 20:38 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 19/34] block: Add bdrv_default_perms() Max Reitz
2020-05-13 20:43 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 20/34] raw-format: Split raw_read_options() Max Reitz
2020-05-13 11:05 ` [PATCH v4 21/34] block: Switch child_format users to child_of_bds Max Reitz
2020-05-13 11:05 ` [PATCH v4 22/34] block: Drop child_format Max Reitz
2020-05-13 11:05 ` [PATCH v4 23/34] block: Make backing files child_of_bds children Max Reitz
2020-05-13 20:46 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 24/34] block: Drop child_backing Max Reitz
2020-05-13 20:47 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 25/34] block: Make format drivers use child_of_bds Max Reitz
2020-05-13 11:05 ` [PATCH v4 26/34] block: Make filter " Max Reitz
2020-05-13 21:02 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 27/34] block: Use child_of_bds in remaining places Max Reitz
2020-05-13 21:08 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 28/34] tests: Use child_of_bds instead of child_file Max Reitz
2020-05-13 11:05 ` [PATCH v4 29/34] block: Use bdrv_default_perms() Max Reitz
2020-05-13 11:05 ` [PATCH v4 30/34] block: Make bdrv_filter_default_perms() static Max Reitz
2020-05-13 11:05 ` Max Reitz [this message]
2020-05-13 11:05 ` [PATCH v4 32/34] block: Drop child_file Max Reitz
2020-05-13 21:11 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 33/34] block: Pass BdrvChildRole in remaining cases Max Reitz
2020-05-13 21:12 ` Eric Blake
2020-05-13 11:05 ` [PATCH v4 34/34] block: Drop @child_class from bdrv_child_perm() Max Reitz
2020-05-13 21:15 ` Eric Blake
2020-05-13 16:36 ` [PATCH v4 00/34] block: Introduce real BdrvChildRole Kevin Wolf
2020-05-14 13:44 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200513110544.176672-32-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).