From patchwork Sat May 5 03:13:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 157023 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 86F8BB6FD8 for ; Sat, 5 May 2012 13:14:29 +1000 (EST) Received: from localhost ([::1]:42088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SQVRz-0002Pw-BL for incoming@patchwork.ozlabs.org; Fri, 04 May 2012 23:14:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SQVRs-0002Pn-CY for qemu-devel@nongnu.org; Fri, 04 May 2012 23:14:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SQVRq-0007eR-Lv for qemu-devel@nongnu.org; Fri, 04 May 2012 23:14:19 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:45064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SQVRq-0007eF-EG for qemu-devel@nongnu.org; Fri, 04 May 2012 23:14:18 -0400 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 4 May 2012 21:14:16 -0600 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 4 May 2012 21:13:35 -0600 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 488E0C9005C for ; Fri, 4 May 2012 23:13:32 -0400 (EDT) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q453DYPX22872076 for ; Fri, 4 May 2012 23:13:34 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q453DX36014537 for ; Fri, 4 May 2012 23:13:34 -0400 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q453DUPS014424; Fri, 4 May 2012 23:13:31 -0400 Received: by us.ibm.com (sSMTP sendmail emulation); Sat, 5 May 2012 11:13:27 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Sat, 5 May 2012 11:13:26 +0800 Message-Id: <1336187606-27365-1-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12050503-7282-0000-0000-000008C1291B X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.149 Cc: kwolf@redhat.com, Zhi Yong Wu , marcandre.lureau@gmail.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 2/2] qcow2: lock on prealloc 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 From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- 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; }