diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-16 19:19:03 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-16 19:19:04 +0000 |
| commit | 3521f767067feedd06ef6d2efd24c1190c68638c (patch) | |
| tree | ddf22090c77557ee8e3c716eb67b53164207b4f9 /include | |
| parent | 17b11a1406fdc43b5022f32a6fbfcb005a353b38 (diff) | |
| parent | 47aced5078e13d6c1f4fbb59616654e577af8aaa (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches for 2.3-rc0
# gpg: Signature made Mon Mar 16 16:11:55 2015 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block/vpc: remove disabled code from get_sector_offset
block/vpc: rename footer->size -> footer->current_size
block/vpc: make calculate_geometry spec conform
vpc: Ignore geometry for large images
block/vpc: optimize vpc_co_get_block_status
block: Drop bdrv_find
blockdev: Convert bdrv_find to blk_by_name
migration: Convert bdrv_find to blk_by_name
monitor: Convert bdrv_find to blk_by_name
iotests: Test non-self-referential qcow2 refblocks
iotests: Add tests for refcount table growth
qcow2: Respect new_block in alloc_refcount_block()
qemu-img: Avoid qerror_report_err() outside QMP handlers, again
block: Fix block-set-write-threshold not to use funky error class
block: Deprecate QCOW/QCOW2 encryption
qemu-img: Fix convert, amend error messages for unknown options
iotests: Update 051's reference output
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/block/block.h b/include/block/block.h index 473c746342..4c57d63fe2 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -381,7 +381,6 @@ int bdrv_media_changed(BlockDriverState *bs); void bdrv_lock_medium(BlockDriverState *bs, bool locked); void bdrv_eject(BlockDriverState *bs, bool eject_flag); const char *bdrv_get_format_name(BlockDriverState *bs); -BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_find_node(const char *node_name); BlockDeviceInfoList *bdrv_named_nodes_list(void); BlockDriverState *bdrv_lookup_bs(const char *device, |