From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH v2 30/33] block: Drop bdrv_format_default_perms()
Date: Tue, 4 Feb 2020 18:08:45 +0100 [thread overview]
Message-ID: <20200204170848.614480-31-mreitz@redhat.com> (raw)
In-Reply-To: <20200204170848.614480-1-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block.c | 19 -------------------
include/block/block_int.h | 11 -----------
2 files changed, 30 deletions(-)
diff --git a/block.c b/block.c
index 091e9cc16a..b6e35ed552 100644
--- a/block.c
+++ b/block.c
@@ -2317,25 +2317,6 @@ static void bdrv_default_perms_for_data(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_metadata(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,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 5e3f512ae8..a20891e067 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -1254,17 +1254,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);
--
2.24.1
next prev parent reply other threads:[~2020-02-04 17:25 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 17:08 [PATCH v2 00/33] block: Introduce real BdrvChildRole Max Reitz
2020-02-04 17:08 ` [PATCH v2 01/33] block: Add BlockDriver.is_format Max Reitz
2020-02-05 13:51 ` Eric Blake
2020-02-06 10:25 ` Max Reitz
2020-02-11 15:30 ` Alberto Garcia
2020-02-04 17:08 ` [PATCH v2 02/33] block: Rename BdrvChildRole to BdrvChildClass Max Reitz
2020-02-05 15:20 ` Eric Blake
2020-02-11 15:31 ` Alberto Garcia
2020-02-04 17:08 ` [PATCH v2 03/33] block: Add BdrvChildRole Max Reitz
2020-02-05 15:24 ` Eric Blake
2020-02-06 10:47 ` Max Reitz
2020-02-06 10:49 ` Max Reitz
2020-02-11 15:35 ` Eric Blake
2020-02-11 15:41 ` Alberto Garcia
2020-02-17 14:40 ` Max Reitz
2020-02-04 17:08 ` [PATCH v2 04/33] block: Add BdrvChildRole to BdrvChild Max Reitz
2020-02-05 15:33 ` Eric Blake
2020-02-06 10:53 ` Max Reitz
2020-02-11 15:37 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 05/33] block: Pass BdrvChildRole to bdrv_child_perm() Max Reitz
2020-02-05 16:14 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 06/33] block: Pass BdrvChildRole to .inherit_options() Max Reitz
2020-02-05 16:18 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 07/33] block: Pass parent_is_format " Max Reitz
2020-02-05 16:26 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 08/33] block: Rename bdrv_inherited_options() Max Reitz
2020-02-05 16:36 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 09/33] block: Add generic bdrv_inherited_options() Max Reitz
2020-02-05 16:48 ` Eric Blake
2020-02-06 11:06 ` Max Reitz
2020-02-04 17:08 ` [PATCH v2 10/33] block: Use bdrv_inherited_options() Max Reitz
2020-02-05 17:14 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 11/33] block: Unify bdrv_child_cb_attach() Max Reitz
2020-02-05 17:24 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 12/33] block: Unify bdrv_child_cb_detach() Max Reitz
2020-02-05 17:26 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 13/33] block: Add child_of_bds Max Reitz
2020-02-05 20:33 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 14/33] block: Distinguish paths in *_format_default_perms Max Reitz
2020-02-05 20:54 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 15/33] block: Pull out bdrv_default_perms_for_backing() Max Reitz
2020-02-05 20:56 ` Eric Blake
2020-02-06 11:19 ` Max Reitz
2020-02-11 15:38 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 16/33] block: Pull out bdrv_default_perms_for_storage() Max Reitz
2020-02-05 21:02 ` Eric Blake
2020-02-06 11:20 ` Max Reitz
2020-02-04 17:08 ` [PATCH v2 17/33] block: Split bdrv_default_perms_for_storage() Max Reitz
2020-02-05 21:25 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 18/33] block: Add bdrv_default_perms() Max Reitz
2020-02-05 21:53 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 19/33] raw-format: Split raw_read_options() Max Reitz
2020-02-05 21:57 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 20/33] block: Switch child_format users to child_of_bds Max Reitz
2020-02-05 22:11 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 21/33] block: Drop child_format Max Reitz
2020-02-05 22:19 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 22/33] block: Make backing files child_of_bds children Max Reitz
2020-02-05 22:45 ` Eric Blake
2020-02-06 11:33 ` Max Reitz
2020-02-11 15:39 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 23/33] block: Drop child_backing Max Reitz
2020-02-05 22:48 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 24/33] block: Make format drivers use child_of_bds Max Reitz
2020-02-05 22:54 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 25/33] block: Make filter " Max Reitz
2020-02-05 23:02 ` Eric Blake
2020-02-06 11:35 ` Max Reitz
2020-02-04 17:08 ` [PATCH v2 26/33] block: Use child_of_bds in remaining places Max Reitz
2020-02-05 23:28 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 27/33] tests: Use child_of_bds instead of child_file Max Reitz
2020-02-11 15:42 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 28/33] block: Use bdrv_default_perms() Max Reitz
2020-02-11 15:46 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 29/33] block: Make bdrv_filter_default_perms() static Max Reitz
2020-02-11 15:48 ` Eric Blake
2020-02-04 17:08 ` Max Reitz [this message]
2020-02-11 15:48 ` [PATCH v2 30/33] block: Drop bdrv_format_default_perms() Eric Blake
2020-02-04 17:08 ` [PATCH v2 31/33] block: Drop child_file Max Reitz
2020-02-11 15:49 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 32/33] block: Pass BdrvChildRole in remaining cases Max Reitz
2020-02-11 15:53 ` Eric Blake
2020-02-18 12:01 ` Max Reitz
2020-02-18 12:53 ` Eric Blake
2020-02-04 17:08 ` [PATCH v2 33/33] block: Drop @child_class from bdrv_child_perm() Max Reitz
2020-02-11 15:56 ` Eric Blake
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=20200204170848.614480-31-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).