[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/43] block: Require .bdrv_child_perm() with chi
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 10/43] block: Require .bdrv_child_perm() with child nodes |
Date: |
Mon, 27 Feb 2017 21:09:11 +0100 |
All block drivers that can have child nodes implement .bdrv_child_perm()
now. Make this officially a requirement by asserting that only drivers
without children can omit .bdrv_child_perm().
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 7ae8264..d2c8126 100644
--- a/block.c
+++ b/block.c
@@ -1361,8 +1361,9 @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t
cumulative_perms,
cumulative_shared_perms, errp);
}
- /* Drivers may not have .bdrv_child_perm() */
+ /* Drivers that never have children can omit .bdrv_child_perm() */
if (!drv->bdrv_child_perm) {
+ assert(QLIST_EMPTY(&bs->children));
return 0;
}
@@ -1421,8 +1422,9 @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t
cumulative_perms,
drv->bdrv_set_perm(bs, cumulative_perms, cumulative_shared_perms);
}
- /* Drivers may not have .bdrv_child_perm() */
+ /* Drivers that never have children can omit .bdrv_child_perm() */
if (!drv->bdrv_child_perm) {
+ assert(QLIST_EMPTY(&bs->children));
return;
}
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/43] New op blocker system, part 1, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 01/43] block: Add op blocker permission constants, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 03/43] block: Let callers request permissions when attaching a child node, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 02/43] block: Add Error argument to bdrv_attach_child(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 05/43] block: Default .bdrv_child_perm() for filter drivers, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 04/43] block: Involve block drivers in permission granting, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 06/43] block: Request child permissions in filter drivers, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 07/43] block: Default .bdrv_child_perm() for format drivers, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 08/43] block: Request child permissions in format drivers, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 10/43] block: Require .bdrv_child_perm() with child nodes,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 09/43] vvfat: Implement .bdrv_child_perm(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 11/43] block: Request real permissions in bdrv_attach_child(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 12/43] block: Add permissions to BlockBackend, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 13/43] block: Add permissions to blk_new(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 14/43] block: Add error parameter to blk_insert_bs(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 15/43] block: Add BDRV_O_RESIZE for blk_new_open(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 16/43] block: Request real permissions in blk_new_open(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 17/43] block: Allow error return in BlockDevOps.change_media_cb(), Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 18/43] hw/block: Request permissions, Kevin Wolf, 2017/02/27
- [Qemu-devel] [PATCH v2 20/43] blockjob: Add permissions to block_job_create(), Kevin Wolf, 2017/02/27