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

qcow2: Rename l2_table in count_contiguous_clusters_unallocated() 



This function doesn't need any changes to support L2 slices, but since
it's now dealing with slices instead 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: 78bcc54bc632574dd0b900a77a00a1b6ffc359e6.1517840877.git.berto@igalia.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 13f893c4

block/qcow2-cluster.c

+3 −3
Original line number Diff line number Diff line
@@ -406,10 +406,10 @@ static int count_contiguous_clusters(int nb_clusters, int cluster_size, 


/*

 * Checks how many consecutive unallocated clusters in a given L2

 * table have the same cluster type.

 * slice have the same cluster type.

 */

static int count_contiguous_clusters_unallocated(int nb_clusters,

                                                 uint64_t *l2_table,

                                                 uint64_t *l2_slice,

                                                 QCow2ClusterType wanted_type)

{

    int i;
@@ -417,7 +417,7 @@ static int count_contiguous_clusters_unallocated(int nb_clusters, 
    assert(wanted_type == QCOW2_CLUSTER_ZERO_PLAIN ||

           wanted_type == QCOW2_CLUSTER_UNALLOCATED);

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

        uint64_t entry = be64_to_cpu(l2_table[i]);

        uint64_t entry = be64_to_cpu(l2_slice[i]);

        QCow2ClusterType type = qcow2_get_cluster_type(entry);



        if (type != wanted_type) {