[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/51] block: Rename bdrv_inherited_options()
From: |
Kevin Wolf |
Subject: |
[PULL 21/51] block: Rename bdrv_inherited_options() |
Date: |
Fri, 15 May 2020 14:44:51 +0200 |
From: Max Reitz <address@hidden>
The other two .inherit_options implementations specify exactly for what
case they are used in their name, so do it for this one as well.
(The actual intention behind this patch is to follow it up with a
generic bdrv_inherited_options() that works for all three cases.)
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index b78e2dc141..a17c29f54b 100644
--- a/block.c
+++ b/block.c
@@ -1154,9 +1154,9 @@ static void bdrv_temp_snapshot_options(int *child_flags,
QDict *child_options,
* Returns the options and flags that bs->file should get if a protocol driver
* is expected, based on the given options and flags for the parent BDS
*/
-static void bdrv_inherited_options(BdrvChildRole role, bool parent_is_format,
- int *child_flags, QDict *child_options,
- int parent_flags, QDict *parent_options)
+static void bdrv_protocol_options(BdrvChildRole role, bool parent_is_format,
+ int *child_flags, QDict *child_options,
+ int parent_flags, QDict *parent_options)
{
int flags = parent_flags;
@@ -1188,7 +1188,7 @@ static void bdrv_inherited_options(BdrvChildRole role,
bool parent_is_format,
const BdrvChildClass child_file = {
.parent_is_bds = true,
.get_parent_desc = bdrv_child_get_parent_desc,
- .inherit_options = bdrv_inherited_options,
+ .inherit_options = bdrv_protocol_options,
.drained_begin = bdrv_child_cb_drained_begin,
.drained_poll = bdrv_child_cb_drained_poll,
.drained_end = bdrv_child_cb_drained_end,
--
2.25.4
- [PULL 14/51] block: Add BlockDriver.is_format, (continued)
- [PULL 14/51] block: Add BlockDriver.is_format, Kevin Wolf, 2020/05/15
- [PULL 22/51] block: Add generic bdrv_inherited_options(), Kevin Wolf, 2020/05/15
- [PULL 23/51] block: Use bdrv_inherited_options(), Kevin Wolf, 2020/05/15
- [PULL 20/51] block: Pass parent_is_format to .inherit_options(), Kevin Wolf, 2020/05/15
- [PULL 18/51] block: Pass BdrvChildRole to bdrv_child_perm(), Kevin Wolf, 2020/05/15
- [PULL 25/51] block: Unify bdrv_child_cb_detach(), Kevin Wolf, 2020/05/15
- [PULL 28/51] block: Pull out bdrv_default_perms_for_cow(), Kevin Wolf, 2020/05/15
- [PULL 27/51] block: Distinguish paths in *_format_default_perms, Kevin Wolf, 2020/05/15
- [PULL 26/51] block: Add child_of_bds, Kevin Wolf, 2020/05/15
- [PULL 29/51] block: Pull out bdrv_default_perms_for_storage(), Kevin Wolf, 2020/05/15
- [PULL 21/51] block: Rename bdrv_inherited_options(),
Kevin Wolf <=
- [PULL 24/51] block: Unify bdrv_child_cb_attach(), Kevin Wolf, 2020/05/15
- [PULL 30/51] block: Relax *perms_for_storage for data children, Kevin Wolf, 2020/05/15
- [PULL 31/51] block: Add bdrv_default_perms(), Kevin Wolf, 2020/05/15
- [PULL 32/51] raw-format: Split raw_read_options(), Kevin Wolf, 2020/05/15
- [PULL 34/51] block: Drop child_format, Kevin Wolf, 2020/05/15
- [PULL 33/51] block: Switch child_format users to child_of_bds, Kevin Wolf, 2020/05/15
- [PULL 37/51] block: Make format drivers use child_of_bds, Kevin Wolf, 2020/05/15
- [PULL 35/51] block: Make backing files child_of_bds children, Kevin Wolf, 2020/05/15
- [PULL 36/51] block: Drop child_backing, Kevin Wolf, 2020/05/15
- [PULL 38/51] block: Make filter drivers use child_of_bds, Kevin Wolf, 2020/05/15