From patchwork Wed Feb 6 12:31:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 218599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1A8602C02FA for ; Thu, 7 Feb 2013 00:06:28 +1100 (EST) Received: from localhost ([::1]:36203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34By-0007Sw-UJ for incoming@patchwork.ozlabs.org; Wed, 06 Feb 2013 07:33:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34BY-0006nh-69 for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:33:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U34BT-0005AF-E3 for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:33:08 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43637 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U34BT-0005A6-0I for qemu-devel@nongnu.org; Wed, 06 Feb 2013 07:33:03 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 5EF00874323; Wed, 6 Feb 2013 13:33:02 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 3D0F287432F; Wed, 6 Feb 2013 13:31:20 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 6 Feb 2013 13:31:49 +0100 Message-Id: <1360153926-9492-17-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360153926-9492-1-git-send-email-benoit@irqsave.net> References: <1360153926-9492-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V6 16/33] qcow2: Extract qcow2_do_table_init. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Canet --- block/qcow2-refcount.c | 43 ++++++++++++++++++++++++++++++------------- block/qcow2.h | 5 +++++ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 296c440..9c16816 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -31,27 +31,44 @@ 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 becb2f8..7825f13 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -390,6 +390,11 @@ int qcow2_read_cluster_data(BlockDriverState *bs, int nb_sectors); /* 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);