On 05.05.2021 09:59, Vladimir Sementsov-Ogievskiy wrote:
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
> Reviewed-by: Eric Blake <ebl...@redhat.com>
> ---
> block/qcow2.h | 1 +
> block/qcow2-refcount.c | 6 ++++++
> 2 files changed, 7 insertions(+)
>
> diff --git a/block/qcow2.h b/block/qcow2.h
> index b8b1093b61..58fd7f1678 100644
> --- a/block/qcow2.h
> +++ b/block/qcow2.h
> @@ -586,6 +586,7 @@ typedef enum QCow2MetadataOverlap {
> (QCOW2_OL_CACHED | QCOW2_OL_INACTIVE_L2)
>
> #define L1E_OFFSET_MASK 0x00fffffffffffe00ULL
> +#define L1E_RESERVED_MASK 0x7f000000000001ffULL
> #define L2E_OFFSET_MASK 0x00fffffffffffe00ULL
> #define L2E_STD_RESERVED_MASK 0x3f000000000001feULL
>
> diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
> index 69294a94fe..15c4f6b075 100644
> --- a/block/qcow2-refcount.c
> +++ b/block/qcow2-refcount.c
> @@ -1904,6 +1904,12 @@ static int check_refcounts_l1(BlockDriverState *bs,
> continue;
> }
>
> + if (l1_table[i] & L1E_RESERVED_MASK) {
> + fprintf(stderr, "ERROR found L1 entry with reserved bits set: "
> + "%" PRIx64, l1_table[i]);
'\n' is missed.
The rest is OK for me.
Tested-by: Kirill Tkhai <ktk...@virtuozzo.com>
> + res->corruptions++;
> + }
> +
> l2_offset = l1_table[i] & L1E_OFFSET_MASK;
>
> /* Mark L2 table as used */
>
