diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-26 09:50:58 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-10-26 09:50:58 -0500 |
commit | 21bcc5907f4c4a8acffcda8b6662710784cba388 (patch) | |
tree | 0eed92970495fef0729139bd1e8bbe22983e3177 /block.h | |
parent | 758c309f0a5cb52441a1ee015566cf9cd96fa933 (diff) | |
parent | 8c269b542c5bbbcd74c1664959b223d941a2893b (diff) | |
download | qemu-21bcc5907f4c4a8acffcda8b6662710784cba388.zip qemu-21bcc5907f4c4a8acffcda8b6662710784cba388.tar.gz qemu-21bcc5907f4c4a8acffcda8b6662710784cba388.tar.bz2 |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'block.h')
-rw-r--r-- | block.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -211,6 +211,8 @@ int bdrv_snapshot_goto(BlockDriverState *bs, int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id); int bdrv_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_info); +int bdrv_snapshot_load_tmp(BlockDriverState *bs, + const char *snapshot_name); char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn); char *get_human_readable_size(char *buf, int buf_size, int64_t size); |