[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/34] block: Rename bdrv_inherited_options()
From: |
Max Reitz |
Subject: |
[PATCH v4 09/34] block: Rename bdrv_inherited_options() |
Date: |
Wed, 13 May 2020 13:05:19 +0200 |
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>
---
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.26.2
- [PATCH v4 00/34] block: Introduce real BdrvChildRole, Max Reitz, 2020/05/13
- [PATCH v4 01/34] block: Mark commit, mirror, blkreplay as filters, Max Reitz, 2020/05/13
- [PATCH v4 02/34] block: Add BlockDriver.is_format, Max Reitz, 2020/05/13
- [PATCH v4 04/34] block: Add BdrvChildRole and BdrvChildRoleBits, Max Reitz, 2020/05/13
- [PATCH v4 05/34] block: Add BdrvChildRole to BdrvChild, Max Reitz, 2020/05/13
- [PATCH v4 07/34] block: Pass BdrvChildRole to .inherit_options(), Max Reitz, 2020/05/13
- [PATCH v4 06/34] block: Pass BdrvChildRole to bdrv_child_perm(), Max Reitz, 2020/05/13
- [PATCH v4 03/34] block: Rename BdrvChildRole to BdrvChildClass, Max Reitz, 2020/05/13
- [PATCH v4 08/34] block: Pass parent_is_format to .inherit_options(), Max Reitz, 2020/05/13
- [PATCH v4 09/34] block: Rename bdrv_inherited_options(),
Max Reitz <=
- [PATCH v4 10/34] block: Add generic bdrv_inherited_options(), Max Reitz, 2020/05/13
- [PATCH v4 12/34] block: Unify bdrv_child_cb_attach(), Max Reitz, 2020/05/13
- [PATCH v4 11/34] block: Use bdrv_inherited_options(), Max Reitz, 2020/05/13
- [PATCH v4 13/34] block: Unify bdrv_child_cb_detach(), Max Reitz, 2020/05/13
- [PATCH v4 14/34] block: Add child_of_bds, Max Reitz, 2020/05/13