diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 16:58:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 16:58:16 +0100 |
| commit | 50104f5ac537eecc890c65e99362df47bac3f9d9 (patch) | |
| tree | f80ef7933fc3f4e43ccb11f24d7b98a93656e89a /include | |
| parent | ce1d20aac8533357650774c2c240e30de87dc122 (diff) | |
| parent | 2c93c5cb43fd992038711f84ea34c9373273cda6 (diff) | |
| download | qemu-50104f5ac537eecc890c65e99362df47bac3f9d9.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.10.0-rc0
# gpg: Signature made Mon 24 Jul 2017 15:16:42 BST
# 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:
qemu-iotests: Avoid unnecessary sleeps
block: Skip implicit nodes in query-block/blockstats
qcow2: Fix sector calculation in qcow2_measure()
dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented
iotests: Remove a few tests from 'quick' group
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 1 | ||||
| -rw-r--r-- | include/block/block_int.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/block/block.h b/include/block/block.h index b3e2674845..34770bb33a 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -300,7 +300,6 @@ int coroutine_fn bdrv_co_pwrite_zeroes(BdrvChild *child, int64_t offset, int bytes, BdrvRequestFlags flags); BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs, const char *backing_file); -int bdrv_get_backing_file_depth(BlockDriverState *bs); void bdrv_refresh_filename(BlockDriverState *bs); int bdrv_truncate(BdrvChild *child, int64_t offset, PreallocMode prealloc, Error **errp); diff --git a/include/block/block_int.h b/include/block/block_int.h index 5c6b761d81..d4f4ea7584 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -549,6 +549,7 @@ struct BlockDriverState { bool sg; /* if true, the device is a /dev/sg* */ bool probed; /* if true, format was probed rather than specified */ bool force_share; /* if true, always allow all shared permissions */ + bool implicit; /* if true, this filter node was automatically inserted */ BlockDriver *drv; /* NULL means no media */ void *opaque; |