Commit 13f893c4 authored by Alberto Garcia's avatar Alberto Garcia Committed by Max Reitz
Browse files

qcow2: Rename l2_table in count_contiguous_clusters() 



This function doesn't need any changes to support L2 slices, but since
it's now dealing with slices intead of full tables, the l2_table
variable is renamed for clarity.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 812b0c3505bb1687e51285dccf1a94f0cecb1f74.1517840877.git.berto@igalia.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent e4e72548

block/qcow2-cluster.c

+4 −4
Original line number Diff line number Diff line
@@ -370,19 +370,19 @@ fail: 
}



/*

 * Checks how many clusters in a given L2 table are contiguous in the image

 * Checks how many clusters in a given L2 slice are contiguous in the image

 * file. As soon as one of the flags in the bitmask stop_flags changes compared

 * to the first cluster, the search is stopped and the cluster is not counted

 * as contiguous. (This allows it, for example, to stop at the first compressed

 * cluster which may require a different handling)

 */

static int count_contiguous_clusters(int nb_clusters, int cluster_size,

        uint64_t *l2_table, uint64_t stop_flags)

        uint64_t *l2_slice, uint64_t stop_flags)

{

    int i;

    QCow2ClusterType first_cluster_type;

    uint64_t mask = stop_flags | L2E_OFFSET_MASK | QCOW_OFLAG_COMPRESSED;

    uint64_t first_entry = be64_to_cpu(l2_table[0]);

    uint64_t first_entry = be64_to_cpu(l2_slice[0]);

    uint64_t offset = first_entry & mask;



    if (!offset) {
@@ -395,7 +395,7 @@ static int count_contiguous_clusters(int nb_clusters, int cluster_size, 
           first_cluster_type == QCOW2_CLUSTER_ZERO_ALLOC);



    for (i = 0; i < nb_clusters; i++) {

        uint64_t l2_entry = be64_to_cpu(l2_table[i]) & mask;

        uint64_t l2_entry = be64_to_cpu(l2_slice[i]) & mask;

        if (offset + (uint64_t) i * cluster_size != l2_entry) {

            break;

        }