From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVyV-0000yk-Bz for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:51:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGVyQ-00055g-PP for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:51:15 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:59620 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVyQ-00055J-3u for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:51:10 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Mar 2013 15:49:32 +0100 Message-Id: <1363358986-8360-19-git-send-email-benoit@irqsave.net> In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net> References: <1363358986-8360-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V7 18/32] qcow2: Extract qcow2_set_incompat_feature and qcow2_clear_incompat_feature. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Also change callers. Signed-off-by: Benoit Canet --- block/qcow2-cluster.c | 2 +- block/qcow2.c | 43 ++++++++++++++++++++++--------------------- block/qcow2.h | 7 ++++--- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index bc42fc6..1008df8 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -721,7 +721,7 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m) /* Update L2 table. */ if (s->compatible_features & QCOW2_COMPAT_LAZY_REFCOUNTS) { - qcow2_mark_dirty(bs); + qcow2_set_incompat_feature(bs, QCOW2_INCOMPAT_DIRTY); } if (qcow2_need_accurate_refcounts(s)) { qcow2_cache_set_dependency(bs, s->l2_table_cache, diff --git a/block/qcow2.c b/block/qcow2.c index 6d693ac..1210780 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -245,56 +245,57 @@ static void report_unsupported_feature(BlockDriverState *bs, } /* - * Sets the dirty bit and flushes afterwards if necessary. + * Sets the an incompatible feature bit and flushes afterwards if necessary. * * The incompatible_features bit is only set if the image file header was * updated successfully. Therefore it is not required to check the return * value of this function. */ -int qcow2_mark_dirty(BlockDriverState *bs) +int qcow2_set_incompat_feature(BlockDriverState *bs, + QCow2IncompatibleFeature feature) { BDRVQcowState *s = bs->opaque; uint64_t val; - int ret; + int ret = 0; assert(s->qcow_version >= 3); - if (s->incompatible_features & QCOW2_INCOMPAT_DIRTY) { - return 0; /* already dirty */ + if (s->incompatible_features & feature) { + return 0; /* already added */ } - val = cpu_to_be64(s->incompatible_features | QCOW2_INCOMPAT_DIRTY); + val = cpu_to_be64(s->incompatible_features | feature); ret = bdrv_pwrite(bs->file, offsetof(QCowHeader, incompatible_features), &val, sizeof(val)); if (ret < 0) { return ret; } - ret = bdrv_flush(bs->file); - if (ret < 0) { - return ret; - } - /* Only treat image as dirty if the header was updated successfully */ - s->incompatible_features |= QCOW2_INCOMPAT_DIRTY; + /* Only treat image as having the feature if the header was updated + * successfully + */ + s->incompatible_features |= feature; return 0; } /* - * Clears the dirty bit and flushes before if necessary. Only call this - * function when there are no pending requests, it does not guard against - * concurrent requests dirtying the image. + * Clears an incompatible feature bit and flushes before if necessary. + * Only call this function when there are no pending requests, it does not + * guard against concurrent requests adding a feature to the image. */ -static int qcow2_mark_clean(BlockDriverState *bs) +static int qcow2_clear_incompat_feature(BlockDriverState *bs, + QCow2IncompatibleFeature feature) { BDRVQcowState *s = bs->opaque; + int ret = 0; - if (s->incompatible_features & QCOW2_INCOMPAT_DIRTY) { - int ret = bdrv_flush(bs); + if (s->incompatible_features & feature) { + ret = bdrv_flush(bs); if (ret < 0) { return ret; } - s->incompatible_features &= ~QCOW2_INCOMPAT_DIRTY; + s->incompatible_features &= ~feature; return qcow2_update_header(bs); } return 0; @@ -309,7 +310,7 @@ static int qcow2_check(BlockDriverState *bs, BdrvCheckResult *result, } if (fix && result->check_errors == 0 && result->corruptions == 0) { - return qcow2_mark_clean(bs); + return qcow2_clear_incompat_feature(bs, QCOW2_INCOMPAT_DIRTY); } return ret; } @@ -906,7 +907,7 @@ static void qcow2_close(BlockDriverState *bs) qcow2_cache_flush(bs, s->l2_table_cache); qcow2_cache_flush(bs, s->refcount_block_cache); - qcow2_mark_clean(bs); + qcow2_clear_incompat_feature(bs, QCOW2_INCOMPAT_DIRTY); qcow2_cache_destroy(bs, s->l2_table_cache); qcow2_cache_destroy(bs, s->refcount_block_cache); diff --git a/block/qcow2.h b/block/qcow2.h index 1493276..fd48243 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -172,14 +172,14 @@ enum { }; /* Incompatible feature bits */ -enum { +typedef enum { QCOW2_INCOMPAT_DIRTY_BITNR = 0, QCOW2_INCOMPAT_DIRTY = 1 << QCOW2_INCOMPAT_DIRTY_BITNR, QCOW2_INCOMPAT_DEDUP_BITNR = 1, QCOW2_INCOMPAT_DEDUP = 1 << QCOW2_INCOMPAT_DEDUP_BITNR, QCOW2_INCOMPAT_MASK = QCOW2_INCOMPAT_DIRTY | QCOW2_INCOMPAT_DEDUP, -}; +} QCow2IncompatibleFeature; /* Compatible feature bits */ enum { @@ -387,7 +387,8 @@ static inline bool qcow2_need_accurate_refcounts(BDRVQcowState *s) int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov, int64_t sector_num, int nb_sectors); -int qcow2_mark_dirty(BlockDriverState *bs); +int qcow2_set_incompat_feature(BlockDriverState *bs, + QCow2IncompatibleFeature feature); int qcow2_update_header(BlockDriverState *bs); int qcow2_read_cluster_data(BlockDriverState *bs, uint8_t *data, -- 1.7.10.4