From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLHQn-00024e-Bc for qemu-devel@nongnu.org; Tue, 10 Feb 2015 15:29:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLHQk-0006q2-8q for qemu-devel@nongnu.org; Tue, 10 Feb 2015 15:29:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLHQk-0006ps-1H for qemu-devel@nongnu.org; Tue, 10 Feb 2015 15:29:10 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1AKT9Rv006200 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 10 Feb 2015 15:29:09 -0500 From: Max Reitz Date: Tue, 10 Feb 2015 15:28:43 -0500 Message-Id: <1423600146-7642-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1423600146-7642-1-git-send-email-mreitz@redhat.com> References: <1423600146-7642-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 01/24] qcow2: Add two new fields to BDRVQcowState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Add two new fields regarding refcount information (the bit width of every entry and the maximum refcount value) to the BDRVQcowState. Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 4 ++-- block/qcow2.c | 3 +++ block/qcow2.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index b956365..f43093f 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -596,7 +596,7 @@ static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs, refcount = be16_to_cpu(refcount_block[block_index]); refcount += addend; - if (refcount < 0 || refcount > 0xffff) { + if (refcount < 0 || refcount > s->refcount_max) { ret = -EINVAL; goto fail; } @@ -787,7 +787,7 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size) return refcount; } - if (refcount == 0xffff) { + if (refcount == s->refcount_max) { offset = 0; } } diff --git a/block/qcow2.c b/block/qcow2.c index 7e614d7..1babb29 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -684,6 +684,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } s->refcount_order = header.refcount_order; + s->refcount_bits = 1 << s->refcount_order; + s->refcount_max = UINT64_C(1) << (s->refcount_bits - 1); + s->refcount_max += s->refcount_max - 1; if (header.crypt_method > QCOW_CRYPT_AES) { error_setg(errp, "Unsupported encryption method: %" PRIu32, diff --git a/block/qcow2.h b/block/qcow2.h index 6e39a1b..4d8c902 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -258,6 +258,8 @@ typedef struct BDRVQcowState { int qcow_version; bool use_lazy_refcounts; int refcount_order; + int refcount_bits; + uint64_t refcount_max; bool discard_passthrough[QCOW2_DISCARD_MAX]; -- 2.1.0