Commit b8c8353a authored by Kevin Wolf's avatar Kevin Wolf
Browse files

qcow2: Prepare count_contiguous_clusters() for external data file 



Offset 0 can be valid for normal (allocated) clusters now, so use
qcow2_get_cluster_type() instead.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a4ea184d

block/qcow2-cluster.c

+2 −2
Original line number Diff line number Diff line
@@ -389,12 +389,12 @@ static int count_contiguous_clusters(BlockDriverState *bs, int nb_clusters, 
    uint64_t first_entry = be64_to_cpu(l2_slice[0]);

    uint64_t offset = first_entry & mask;



    if (!offset) {

    first_cluster_type = qcow2_get_cluster_type(bs, first_entry);

    if (first_cluster_type == QCOW2_CLUSTER_UNALLOCATED) {

        return 0;

    }



    /* must be allocated */

    first_cluster_type = qcow2_get_cluster_type(bs, first_entry);

    assert(first_cluster_type == QCOW2_CLUSTER_NORMAL ||

           first_cluster_type == QCOW2_CLUSTER_ZERO_ALLOC);