From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRSAJ-0007yq-02 for qemu-devel@nongnu.org; Mon, 07 May 2012 13:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRSAH-00031f-BB for qemu-devel@nongnu.org; Mon, 07 May 2012 13:56:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRSAH-00031H-3Q for qemu-devel@nongnu.org; Mon, 07 May 2012 13:56:05 -0400 From: Kevin Wolf Date: Mon, 7 May 2012 19:55:53 +0200 Message-Id: <1336413354-5244-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1336413354-5244-1-git-send-email-kwolf@redhat.com> References: <1336413354-5244-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 4/5] qcow2: lock on prealloc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Zhi Yong Wu preallocate() will be locked. This is required because qcow2_alloc_cluster_link_l2() assumes that it runs under a lock that it can drop while COW is being performed. Signed-off-by: Zhi Yong Wu Signed-off-by: Kevin Wolf --- block/qcow2.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 8c60a6f..ee4678f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1192,7 +1192,10 @@ static int qcow2_create2(const char *filename, int64_t total_size, /* And if we're supposed to preallocate metadata, do that now */ if (prealloc) { + BDRVQcowState *s = bs->opaque; + qemu_co_mutex_lock(&s->lock); ret = preallocate(bs); + qemu_co_mutex_unlock(&s->lock); if (ret < 0) { goto out; } -- 1.7.6.5