diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-12 09:51:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-12 09:51:50 +0000 |
| commit | d85e60e993808d69287dd5e3734642421e23ec45 (patch) | |
| tree | 9221f570449fe6983510ee7d7482110ddbd63abe /include | |
| parent | 22c5f446514a2a4bb0dbe1fea26713da92fc85fa (diff) | |
| parent | ddd113beedd22908e676d53803843d2f85bf91ab (diff) | |
| download | qemu-d85e60e993808d69287dd5e3734642421e23ec45.zip qemu-d85e60e993808d69287dd5e3734642421e23ec45.tar.gz qemu-d85e60e993808d69287dd5e3734642421e23ec45.tar.bz2 | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-02-11' into staging
nbd patches for 2019-02-11
- Add qcow2 bitmap details to 'qemu-img info'
# gpg: Signature made Mon 11 Feb 2019 20:38:32 GMT
# gpg: using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg: aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2019-02-11:
qcow2: list of bitmaps new test 242
qcow2: Add list of bitmaps to ImageInfoSpecificQCow2
bdrv_query_image_info Error parameter added
nbd/server: Kill pointless shadowed variable
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 3 | ||||
| -rw-r--r-- | include/block/block_int.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/block/block.h b/include/block/block.h index 57233cf..73357c6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -478,7 +478,8 @@ const char *bdrv_get_device_name(const BlockDriverState *bs); const char *bdrv_get_device_or_node_name(const BlockDriverState *bs); int bdrv_get_flags(BlockDriverState *bs); int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi); -ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs); +ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs, + Error **errp); void bdrv_round_to_clusters(BlockDriverState *bs, int64_t offset, int64_t bytes, int64_t *cluster_offset, diff --git a/include/block/block_int.h b/include/block/block_int.h index f605622..0075baf 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -319,7 +319,8 @@ struct BlockDriver { const char *name, Error **errp); int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi); - ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs); + ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs, + Error **errp); int coroutine_fn (*bdrv_save_vmstate)(BlockDriverState *bs, QEMUIOVector *qiov, |