diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-03 14:55:49 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-03 14:55:49 -0500 |
| commit | 358c360feb346dff8f911e2d1dbcdd6319393f1d (patch) | |
| tree | a9d2e040f3127901ffb583ca18527511ce7283f6 /block/qcow2.h | |
| parent | 41ef56e61153d7bd27d34a634633bb51b1c5988d (diff) | |
| parent | 1a396859105c4c27fdec08180be26288b8a629a3 (diff) | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'block/qcow2.h')
| -rw-r--r-- | block/qcow2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/qcow2.h b/block/qcow2.h index 01053b79d9..c59b827da8 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -196,8 +196,8 @@ void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num, int nb_sectors, int enc, const AES_KEY *key); -uint64_t qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset, - int *num); +int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset, + int *num, uint64_t *cluster_offset); int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, int n_start, int n_end, int *num, QCowL2Meta *m); uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs, |