[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/33] block: Rename bdrv_inherited_options()
From: |
Max Reitz |
Subject: |
[PATCH v2 08/33] block: Rename bdrv_inherited_options() |
Date: |
Tue, 4 Feb 2020 18:08:23 +0100 |
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>
---
block.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 6091b3c374..5b85520515 100644
--- a/block.c
+++ b/block.c
@@ -980,9 +980,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;
@@ -1014,7 +1014,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.24.1
- [PATCH v2 07/33] block: Pass parent_is_format to .inherit_options(), (continued)
- [PATCH v2 07/33] block: Pass parent_is_format to .inherit_options(), Max Reitz, 2020/02/04
- [PATCH v2 02/33] block: Rename BdrvChildRole to BdrvChildClass, Max Reitz, 2020/02/04
- [PATCH v2 05/33] block: Pass BdrvChildRole to bdrv_child_perm(), Max Reitz, 2020/02/04
- [PATCH v2 09/33] block: Add generic bdrv_inherited_options(), Max Reitz, 2020/02/04
- [PATCH v2 08/33] block: Rename bdrv_inherited_options(),
Max Reitz <=
- [PATCH v2 12/33] block: Unify bdrv_child_cb_detach(), Max Reitz, 2020/02/04
- [PATCH v2 14/33] block: Distinguish paths in *_format_default_perms, Max Reitz, 2020/02/04
- [PATCH v2 13/33] block: Add child_of_bds, Max Reitz, 2020/02/04
- [PATCH v2 15/33] block: Pull out bdrv_default_perms_for_backing(), Max Reitz, 2020/02/04