diff options
| author | Fam Zheng | 2017-03-14 03:30:50 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2017-03-17 12:54:06 +0100 |
| commit | c1cef67251d3e6ae275c0898ccf4cbcfe85d4e0b (patch) | |
| tree | e66118024fe5e6618ffe966901a05862950da8e4 /include/block | |
| parent | file-posix: Don't leak fd in hdev_get_max_segments (diff) | |
| download | qemu-c1cef67251d3e6ae275c0898ccf4cbcfe85d4e0b.tar.gz qemu-c1cef67251d3e6ae275c0898ccf4cbcfe85d4e0b.tar.xz qemu-c1cef67251d3e6ae275c0898ccf4cbcfe85d4e0b.zip | |
block: Always call bdrv_child_check_perm first
bdrv_child_set_perm alone is not very usable because the caller must
call bdrv_child_check_perm first. This is already encapsulated
conveniently in bdrv_child_try_set_perm, so remove the other prototypes
from the header and fix the one wrong caller, block/mirror.c.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/block_int.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index 6c699ac9c3..59400bd848 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -889,10 +889,6 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, void *opaque, Error **errp); void bdrv_root_unref_child(BdrvChild *child); -int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared, - GSList *ignore_children, Error **errp); -void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared); -void bdrv_child_abort_perm_update(BdrvChild *c); int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared, Error **errp); |