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

qcow2: Prepare qcow2_update_snapshot_refcount() for adding L2 slice support 



Adding support for L2 slices to qcow2_update_snapshot_refcount() needs
(among other things) an extra loop that iterates over all slices of
each L2 table.

Putting all changes in one patch would make it hard to read because
all semantic changes would be mixed with pure indentation changes.

To make things easier this patch simply creates a new block and
changes the indentation of all lines of code inside it. Thus, all
modifications in this patch are cosmetic. There are no semantic
changes and no variables are renamed yet. The next patch will take
care of that.

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: 8ffaa5e55bd51121f80e498f4045b64902a94293.1517840877.git.berto@igalia.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent a9a9f8f0

block/qcow2-refcount.c

+75 −69
Original line number Diff line number Diff line
@@ -1236,7 +1236,9 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, 
                goto fail;

            }



            ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset,

            {

                ret = qcow2_cache_get(bs, s->l2_table_cache,

                                      l2_offset,

                                      (void **) &l2_table);

                if (ret < 0) {

                    goto fail;
@@ -1256,8 +1258,8 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, 
                        nb_csectors = ((entry >> s->csize_shift) &

                                       s->csize_mask) + 1;

                        if (addend != 0) {

                        ret = update_refcount(bs,

                                (entry & s->cluster_offset_mask) & ~511,

                            ret = update_refcount(

                                bs, (entry & s->cluster_offset_mask) & ~511,

                                nb_csectors * 512, abs(addend), addend < 0,

                                QCOW2_DISCARD_SNAPSHOT);

                            if (ret < 0) {
@@ -1271,7 +1273,8 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, 
                    case QCOW2_CLUSTER_NORMAL:

                    case QCOW2_CLUSTER_ZERO_ALLOC:

                        if (offset_into_cluster(s, offset)) {

                        qcow2_signal_corruption(bs, true, -1, -1, "Cluster "

                            qcow2_signal_corruption(

                                bs, true, -1, -1, "Cluster "

                                "allocation offset %#" PRIx64

                                " unaligned (L2 offset: %#"

                                PRIx64 ", L2 index: %#x)",
@@ -1283,8 +1286,8 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, 
                        cluster_index = offset >> s->cluster_bits;

                        assert(cluster_index);

                        if (addend != 0) {

                        ret = qcow2_update_cluster_refcount(bs,

                                    cluster_index, abs(addend), addend < 0,

                            ret = qcow2_update_cluster_refcount(

                                bs, cluster_index, abs(addend), addend < 0,

                                QCOW2_DISCARD_SNAPSHOT);

                            if (ret < 0) {

                                goto fail;
@@ -1315,12 +1318,15 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, 
                                                       s->refcount_block_cache);

                        }

                        l2_table[j] = cpu_to_be64(entry);

                    qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);

                        qcow2_cache_entry_mark_dirty(s->l2_table_cache,

                                                     l2_table);

                    }

                }



                qcow2_cache_put(s->l2_table_cache, (void **) &l2_table);



            }



            if (addend != 0) {

                ret = qcow2_update_cluster_refcount(bs, l2_offset >>

                                                        s->cluster_bits,