From patchwork Mon Nov 26 13:05:11 2012 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: 201685 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 5F9012C008C for ; Tue, 27 Nov 2012 00:33:26 +1100 (EST) Received: from localhost ([::1]:39131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyOl-0005cf-ID for incoming@patchwork.ozlabs.org; Mon, 26 Nov 2012 08:06:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyOZ-0005HE-T7 for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcyOS-0005Cx-BO for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:43 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:44858 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyOS-0005Ca-35 for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:36 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 8B9A2874301; Mon, 26 Nov 2012 14:19:33 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 7FE0D874309; Mon, 26 Nov 2012 14:18:14 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2012 14:05:11 +0100 Message-Id: <1353935123-24199-13-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353935123-24199-1-git-send-email-benoit@irqsave.net> References: <1353935123-24199-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 V3 12/24] 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 faca64c..7681001 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -35,27 +35,44 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, /*********************************************************/ /* 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 c7edb14..af80d16 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -300,6 +300,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);