diff options
| author | Kevin Wolf | 2015-03-16 17:11:12 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2015-03-16 17:11:12 +0100 |
| commit | 47aced5078e13d6c1f4fbb59616654e577af8aaa (patch) | |
| tree | 3aea3c10cc10a200a511a845d7b42222e7c6d12a /include | |
| parent | qemu-img: Avoid qerror_report_err() outside QMP handlers, again (diff) | |
| parent | block/vpc: remove disabled code from get_sector_offset (diff) | |
| download | qemu-47aced5078e13d6c1f4fbb59616654e577af8aaa.tar.gz qemu-47aced5078e13d6c1f4fbb59616654e577af8aaa.tar.xz qemu-47aced5078e13d6c1f4fbb59616654e577af8aaa.zip | |
Merge remote-tracking branch 'mreitz/block' into queue-block
* mreitz/block:
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()
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, |