From patchwork Fri Dec 7 17:08:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 204588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0DD5C2C0168 for ; Sat, 8 Dec 2012 04:44:05 +1100 (EST) Received: from localhost ([::1]:41436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th1Qo-0004G0-IH for incoming@patchwork.ozlabs.org; Fri, 07 Dec 2012 12:09:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th1Q9-0002mM-K5 for qemu-devel@nongnu.org; Fri, 07 Dec 2012 12:09:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Th1Q4-0007YU-4n for qemu-devel@nongnu.org; Fri, 07 Dec 2012 12:09:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Th1Q3-0007YO-U4 for qemu-devel@nongnu.org; Fri, 07 Dec 2012 12:09:00 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qB7H8xYw007607 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 7 Dec 2012 12:08:59 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-5-38.ams2.redhat.com [10.36.5.38]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qB7H8oGR022029; Fri, 7 Dec 2012 12:08:58 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2012 18:08:47 +0100 Message-Id: <1354900129-5745-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1354900129-5745-1-git-send-email-kwolf@redhat.com> References: <1354900129-5745-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 6/8] qcow2: Enable dirty flag in qcow2_alloc_cluster_link_l2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is closer to where the dirty flag is really needed, and it avoids having checks for special cases related to cluster allocation directly in the writev loop. Signed-off-by: Kevin Wolf --- block/qcow2-cluster.c | 5 ++++- block/qcow2.c | 7 +------ block/qcow2.h | 2 ++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index c2b59e7..7a038ac 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -668,11 +668,14 @@ 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); + } if (qcow2_need_accurate_refcounts(s)) { qcow2_cache_set_dependency(bs, s->l2_table_cache, s->refcount_block_cache); } + ret = get_cluster_table(bs, m->offset, &l2_table, &l2_index); if (ret < 0) { goto err; diff --git a/block/qcow2.c b/block/qcow2.c index 08d92cc..dbcc0ff 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -222,7 +222,7 @@ static void report_unsupported_feature(BlockDriverState *bs, * updated successfully. Therefore it is not required to check the return * value of this function. */ -static int qcow2_mark_dirty(BlockDriverState *bs) +int qcow2_mark_dirty(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; uint64_t val; @@ -803,11 +803,6 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, goto fail; } - if (l2meta->nb_clusters > 0 && - (s->compatible_features & QCOW2_COMPAT_LAZY_REFCOUNTS)) { - qcow2_mark_dirty(bs); - } - assert((cluster_offset & 511) == 0); qemu_iovec_reset(&hd_qiov); diff --git a/block/qcow2.h b/block/qcow2.h index 6dc79b5..a60fcb4 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -303,6 +303,8 @@ static inline bool qcow2_need_accurate_refcounts(BDRVQcowState *s) /* qcow2.c functions */ int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov, int64_t sector_num, int nb_sectors); + +int qcow2_mark_dirty(BlockDriverState *bs); int qcow2_update_header(BlockDriverState *bs); /* qcow2-refcount.c functions */