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