diff options
| author | Peter Maydell | 2017-03-17 14:26:10 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-03-17 14:26:10 +0100 |
| commit | 31d89228366ce79064ac4fdef98ac85b39bf53ba (patch) | |
| tree | 7bd64123338972d3ee650aeb26a81a068d630f24 /include | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-cirrus-20170316-1' int... (diff) | |
| parent | Merge remote-tracking branch 'mreitz/tags/pull-block-2017-03-17' into queue-b... (diff) | |
| download | qemu-31d89228366ce79064ac4fdef98ac85b39bf53ba.tar.gz qemu-31d89228366ce79064ac4fdef98ac85b39bf53ba.tar.xz qemu-31d89228366ce79064ac4fdef98ac85b39bf53ba.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer fixes for 2.9.0-rc1
# gpg: Signature made Fri 17 Mar 2017 12:06:04 GMT
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
block: quiesce AioContext when detaching from it
thread-pool: add missing qemu_bh_cancel in completion function
block: Propagate error in bdrv_open_backing_file
blockdev: fix bitmap clear undo
block: Always call bdrv_child_check_perm first
file-posix: Don't leak fd in hdev_get_max_segments
replication: clarify permissions
file-posix: clean up max_segments buffer termination
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -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); |