From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4M-00054O-IB for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOW4E-0003I1-T4 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:05 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48811 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4E-0003FL-Ex for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:01:58 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 17 Oct 2012 18:00:21 +0200 Message-Id: <1350489629-1838-13-git-send-email-benoit@irqsave.net> In-Reply-To: <1350489629-1838-1-git-send-email-benoit@irqsave.net> References: <1350489629-1838-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V2 12/20] qcow2: Extract qcow2_do_table_init. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com --- 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