diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-07 08:40:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-07 08:40:52 -0500 |
| commit | 7387de16d0e4d2988df350926537cd12a8e34206 (patch) | |
| tree | 8b7aafb79e2a8197ae002dc3250d9b0ba44520c9 /include/block/qapi.h | |
| parent | b8a75b6093309a43f9837bc2ce63bcf15a7b305f (diff) | |
| parent | e73fe2b46c38776288415ce7bc8ba3fcd23721c4 (diff) | |
Merge remote-tracking branch 'stefanha/block' into staging
# By Kevin Wolf (19) and others
# Via Stefan Hajnoczi
* stefanha/block: (26 commits)
hmp: add parameters device and -v for info block
hmp: show ImageInfo in 'info block'
qmp: add ImageInfo in BlockDeviceInfo used by query-block
block: add image info query function bdrv_query_image_info()
block: add snapshot info query function bdrv_query_snapshot_info_list()
ide-test: Add FLUSH CACHE test case
ide: Set BSY bit during FLUSH
ide-test: Add enum value for DEV
blkdebug: Add BLKDBG_FLUSH_TO_OS/DISK events
Make qemu-io commands available in HMP
qemu-io: Use the qemu version for -V
qemu-io: Interface cleanup
qemu-io: Move remaining helpers from cmd.c
qemu-io: Move command_loop() and friends
qemu-io: Move functions for registering and running commands
qemu-io: Move qemu_strsep() to cutils.c
qemu-io: Move 'quit' function
qemu-io: Move 'help' function
qemu-io: Factor out qemuio_command
qemu-io: Split off commands to qemu-io-cmds.c
...
Message-id: 1370606325-10680-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/block/qapi.h')
| -rw-r--r-- | include/block/qapi.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/block/qapi.h b/include/block/qapi.h index e6e568da94..0496cc9282 100644 --- a/include/block/qapi.h +++ b/include/block/qapi.h @@ -29,11 +29,15 @@ #include "block/block.h" #include "block/snapshot.h" -void bdrv_collect_snapshots(BlockDriverState *bs , ImageInfo *info); -void bdrv_collect_image_info(BlockDriverState *bs, - ImageInfo *info, - const char *filename); -BlockInfo *bdrv_query_info(BlockDriverState *s); +int bdrv_query_snapshot_info_list(BlockDriverState *bs, + SnapshotInfoList **p_list, + Error **errp); +void bdrv_query_image_info(BlockDriverState *bs, + ImageInfo **p_info, + Error **errp); +void bdrv_query_info(BlockDriverState *bs, + BlockInfo **p_info, + Error **errp); BlockStats *bdrv_query_stats(const BlockDriverState *bs); void bdrv_snapshot_dump(fprintf_function func_fprintf, void *f, |