From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgEFu-0000I1-5r for qemu-devel@nongnu.org; Mon, 20 Oct 2014 10:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XgEFo-0001rg-1x for qemu-devel@nongnu.org; Mon, 20 Oct 2014 10:48:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XgEFn-0001rT-Pm for qemu-devel@nongnu.org; Mon, 20 Oct 2014 10:48:11 -0400 Date: Mon, 20 Oct 2014 16:48:05 +0200 From: Kevin Wolf Message-ID: <20141020144805.GP3585@noname.redhat.com> References: <1409348463-16627-1-git-send-email-mreitz@redhat.com> <1409348463-16627-2-git-send-email-mreitz@redhat.com> <20141020142510.GM3585@noname.redhat.com> <54451E8E.70402@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <54451E8E.70402@redhat.com> Subject: Re: [Qemu-devel] [PATCH v5 01/11] qcow2: Calculate refcount block entry count List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Stefan Hajnoczi , qemu-devel@nongnu.org, =?iso-8859-1?Q?Beno=EEt?= Canet Am 20.10.2014 um 16:39 hat Max Reitz geschrieben: > On 20.10.2014 at 16:25, Kevin Wolf wrote: > >Am 29.08.2014 um 23:40 hat Max Reitz geschrieben: > >>The size of a refblock entry is (in theory) variable; calculate > >>therefore the number of entries per refblock and the according bit shift > >>(1 << x == entry count) when opening an image. > >> > >>Signed-off-by: Max Reitz > >>--- > >> block/qcow2.c | 2 ++ > >> block/qcow2.h | 2 ++ > >> 2 files changed, 4 insertions(+) > >> > >>diff --git a/block/qcow2.c b/block/qcow2.c > >>index f9e045f..172ad00 100644 > >>--- a/block/qcow2.c > >>+++ b/block/qcow2.c > >>@@ -689,6 +689,8 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, > >> s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */ > >> s->l2_size = 1 << s->l2_bits; > >>+ s->refcount_block_bits = s->cluster_bits - (s->refcount_order - 3); > >>+ s->refcount_block_size = 1 << s->refcount_block_bits; > >> bs->total_sectors = header.size / 512; > >> s->csize_shift = (62 - (s->cluster_bits - 8)); > >> s->csize_mask = (1 << (s->cluster_bits - 8)) - 1; > >>diff --git a/block/qcow2.h b/block/qcow2.h > >>index 6aeb7ea..7c01fb7 100644 > >>--- a/block/qcow2.h > >>+++ b/block/qcow2.h > >>@@ -222,6 +222,8 @@ typedef struct BDRVQcowState { > >> int l2_size; > >> int l1_size; > >> int l1_vm_state_index; > >>+ int refcount_block_bits; > >>+ int refcount_block_size; > >Might just be me, but size sounds to me as if the unit were bytes. Would > >you mind renaming this as refcount_block_entries or refblock_entries? > > If I'm doing a v7, no. Otherwise, well, see l1_size and l2_size. ;-) Good point. This has confused people more than once, so it's probably not just me. Kevin