[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V2 12/20] qcow2: Extract qcow2_do_table_init.
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [RFC V2 12/20] qcow2: Extract qcow2_do_table_init. |
Date: |
Wed, 17 Oct 2012 18:00:21 +0200 |
---
block/qcow2-refcount.c | 41 ++++++++++++++++++++++++++++-------------
block/qcow2.h | 5 +++++
2 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 692f3fb..3fa2d44 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -32,27 +32,42 @@ static int64_t alloc_clusters_noref(BlockDriverState *bs,
int64_t size);
/*********************************************************/
/* refcount handling */
-int qcow2_refcount_init(BlockDriverState *bs)
+int qcow2_do_table_init(BlockDriverState *bs,
+ uint64_t **table,
+ int64_t offset,
+ int size,
+ bool is_refcount)
{
- BDRVQcowState *s = bs->opaque;
- int ret, refcount_table_size2, i;
-
- refcount_table_size2 = s->refcount_table_size * sizeof(uint64_t);
- s->refcount_table = g_malloc(refcount_table_size2);
- if (s->refcount_table_size > 0) {
- BLKDBG_EVENT(bs->file, BLKDBG_REFTABLE_LOAD);
- ret = bdrv_pread(bs->file, s->refcount_table_offset,
- s->refcount_table, refcount_table_size2);
- if (ret != refcount_table_size2)
+ int ret, size2, i;
+
+ size2 = size * sizeof(uint64_t);
+ *table = g_malloc(size2);
+ if (size > 0) {
+ if (is_refcount) {
+ BLKDBG_EVENT(bs->file, BLKDBG_REFTABLE_LOAD);
+ }
+ ret = bdrv_pread(bs->file, offset,
+ *table, size2);
+ if (ret != size2)
goto fail;
- for(i = 0; i < s->refcount_table_size; i++)
- be64_to_cpus(&s->refcount_table[i]);
+ for(i = 0; i < size; i++)
+ be64_to_cpus(&(*table)[i]);
}
return 0;
fail:
return -ENOMEM;
}
+int qcow2_refcount_init(BlockDriverState *bs)
+{
+ BDRVQcowState *s = bs->opaque;
+ return qcow2_do_table_init(bs,
+ &s->refcount_table,
+ s->refcount_table_offset,
+ s->refcount_table_size,
+ true);
+}
+
void qcow2_refcount_close(BlockDriverState *bs)
{
BDRVQcowState *s = bs->opaque;
diff --git a/block/qcow2.h b/block/qcow2.h
index 6c6e666..1bc6668 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -290,6 +290,11 @@ int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector
*qiov,
int qcow2_update_header(BlockDriverState *bs);
/* qcow2-refcount.c functions */
+int qcow2_do_table_init(BlockDriverState *bs,
+ uint64_t **table,
+ int64_t offset,
+ int size,
+ bool is_refcount);
int qcow2_refcount_init(BlockDriverState *bs);
void qcow2_refcount_close(BlockDriverState *bs);
int QEMU_WARN_UNUSED_RESULT qcow2_update_refcount(BlockDriverState *bs,
--
1.7.10.4
- [Qemu-devel] [RFC V2 08/20] qcow2: Implement qcow2_compute_cluster_hash., (continued)
- [Qemu-devel] [RFC V2 08/20] qcow2: Implement qcow2_compute_cluster_hash., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 09/20] qcow2: Add qcow2_co_load_dedup_hashes., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 05/20] qcow2: Rename update_refcount into qcow2_update_refcount., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 04/20] qcow2: Add qcow2_de dup_read_missing_and_concatenate, Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 15/20] block: Add dedup image create option., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 01/20] qcow2: Add deduplication to the qcow2 specification., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 17/20] qcow2: Integrate deduplication in qcow2_co_writev loop., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 16/20] qcow2: Allow creation of images using deduplication., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 10/20] qcow2: Add qcow2_dedup_grow_table., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 12/20] qcow2: Extract qcow2_do_table_init.,
Benoît Canet <=
- [Qemu-devel] [RFC V2 20/20] qemu-iotests: Filter dedup=on/off so existing tests don't break., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 13/20] qcow2: Add qcow2_dedup_init and qcow2_dedup_close., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 18/20] qcow2: Add method to destroy the deduplication red black tree., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 19/20] qcow2: init and cleanup deduplication., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 02/20] qcow2: Add kernel red black trees, Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 11/20] qcow2: Load and save deduplication table header extension., Benoît Canet, 2012/10/17
- [Qemu-devel] [RFC V2 14/20] qcow2: Extract qcow2_add_feature and qcow2_remove_feature., Benoît Canet, 2012/10/17
- Re: [Qemu-devel] [RFC V2 00/20] QCOW2 deduplication, Avi Kivity, 2012/10/17