[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 10/44] block: Require .bdrv_child_perm() with chi
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v3 10/44] block: Require .bdrv_child_perm() with child nodes |
Date: |
Tue, 28 Feb 2017 13:53:55 +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 281ce7b..52c1f28 100644
--- a/block.c
+++ b/block.c
@@ -1360,8 +1360,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;
}
@@ -1420,8 +1421,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
- Re: [Qemu-block] [PATCH v3 04/44] block: Involve block drivers in permission granting, (continued)
- [Qemu-block] [PATCH v3 05/44] block: Default .bdrv_child_perm() for filter drivers, Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 06/44] block: Request child permissions in filter drivers, Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 07/44] block: Default .bdrv_child_perm() for format drivers, Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 08/44] block: Request child permissions in format drivers, Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 09/44] vvfat: Implement .bdrv_child_perm(), Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 11/44] block: Request real permissions in bdrv_attach_child(), Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 10/44] block: Require .bdrv_child_perm() with child nodes,
Kevin Wolf <=
- [Qemu-block] [PATCH v3 12/44] block: Add permissions to BlockBackend, Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 13/44] block: Add permissions to blk_new(), Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 14/44] block: Add error parameter to blk_insert_bs(), Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 15/44] block: Add BDRV_O_RESIZE for blk_new_open(), Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 16/44] block: Request real permissions in blk_new_open(), Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 18/44] hw/block: Request permissions, Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 17/44] block: Allow error return in BlockDevOps.change_media_cb(), Kevin Wolf, 2017/02/28
- [Qemu-block] [PATCH v3 19/44] hw/block: Introduce share-rw qdev property, Kevin Wolf, 2017/02/28