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

qcow2: Prepare qcow2_get_cluster_type() for external data file 



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

block/qcow2.h

+9 −1
Original line number Diff line number Diff line
@@ -521,7 +521,15 @@ static inline QCow2ClusterType qcow2_get_cluster_type(BlockDriverState *bs, 
        }

        return QCOW2_CLUSTER_ZERO_PLAIN;

    } else if (!(l2_entry & L2E_OFFSET_MASK)) {

        /* Offset 0 generally means unallocated, but it is ambiguous with

         * external data files because 0 is a valid offset there. However, all

         * clusters in external data files always have refcount 1, so we can

         * rely on QCOW_OFLAG_COPIED to disambiguate. */

        if (has_data_file(bs) && (l2_entry & QCOW_OFLAG_COPIED)) {

            return QCOW2_CLUSTER_NORMAL;

        } else {

            return QCOW2_CLUSTER_UNALLOCATED;

        }

    } else {

        return QCOW2_CLUSTER_NORMAL;

    }