From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNTzI-0005YZ-B4 for qemu-devel@nongnu.org; Fri, 29 Aug 2014 17:45:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNTz9-0001TQ-3J for qemu-devel@nongnu.org; Fri, 29 Aug 2014 17:45:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNTz8-0001TI-RQ for qemu-devel@nongnu.org; Fri, 29 Aug 2014 17:45:30 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7TLjUiJ015804 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 29 Aug 2014 17:45:30 -0400 From: Max Reitz Date: Fri, 29 Aug 2014 23:45:25 +0200 Message-Id: <1409348727-17183-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 0/2] qcow2: Drop REFCOUNT_SHIFT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz In preparation for qemu maybe actually supporting variable refcount widths in the far future, drop the hardcoded REFCOUNT_SHIFT and instead use the value as given by the image. Also, the qcow2 documentation gave the width of a refcount block entry as sizeof(uint16_t), which is wrong for any refcount order other than 4. Fix that. This is a follow-up to my "[PATCH v5 00/11] qcow2: Fix image repairing" series and therefore depends on it. Max Reitz (2): qcow2: Drop REFCOUNT_SHIFT docs/qcow2: Correct refcount_block_entries block/qcow2-refcount.c | 32 ++++++++++++++------------------ block/qcow2.c | 2 +- block/qcow2.h | 2 -- docs/specs/qcow2.txt | 2 +- 4 files changed, 16 insertions(+), 22 deletions(-) -- 2.1.0