From nobody Tue Oct 28 02:10:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516188454892176.55577781789736; Wed, 17 Jan 2018 03:27:34 -0800 (PST) Received: from localhost ([::1]:56675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eblsR-0001ki-4A for importer@patchew.org; Wed, 17 Jan 2018 06:27:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eblqR-0000S8-Dp for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:25:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eblqQ-0003t2-GQ for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:25:27 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:34487) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eblqQ-0003sF-As; Wed, 17 Jan 2018 06:25:26 -0500 Received: by mail-wr0-x241.google.com with SMTP id 36so18478572wrh.1; Wed, 17 Jan 2018 03:25:26 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id w11sm2548965wrg.42.2018.01.17.03.25.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2018 03:25:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dfq2b2akh1elQ7l7JMYmwH1vTGFn+7KPU+nR4E79hS0=; b=NXpY0oBKakiawbnnFDYZ1GpRiXjGMjXRPFfC8ylZAzMYYogM22+6C1Me8g20EEkNww /T0CXx1CFUYwhR2GKE4ck1EhYhAZGpNjIZkI7+7TVwo/1UCDn0PZa+OrCKC8Qj5JxJim cjAPXkH7LFPhWgPUfg4gkXoxFR8hI12sIR5HAprwl654KgI2l6ZLKQUWWLLOZU1NdFQs RKLDLHG1BrtOCinVfDQ0jLMZZ+Q1ZuncyXaXPePE0AR/v0yF1pbWzwhnPH8XCzjD4zeI +QkeedaGfNKYHhk9OwdYxkDBfrQDJYjpjTj9rATgWrnYKTDpS7AnPu9fcbyw0k5tUy/j ZWdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dfq2b2akh1elQ7l7JMYmwH1vTGFn+7KPU+nR4E79hS0=; b=Qa7N5PcTLBm56v0Ww9XV8+lJsNluH0qdQW1g92wvwPUEmaPFPu2lu6Z4UV1mz5Hjfb 6EMzK/JrfkswyKt40RhqO96swm9gx7IlGDf8lEA3TJMVFmUdtAAUXUG8l9ImTIwNeWVG Yay+E4V4GmwofSOPYNaQ//24y6p0iQob8jtQKjdGJX+BqudIeFu/ddN5PVJ42HL9xhfF KZl5qqxpX1/T+TwLb9uHuh0FvgzfjLuAJDG3rPzB00od3jLb7jzPu6UYUtr/Ec03QS81 zqJKFWQtNFSRY+Y0Pk7KziTBfhN2IU/qo66rWgFJ9ouzPcfnYhp9gqwXAuRtDSl4lqff us2A== X-Gm-Message-State: AKwxytfMMI5EdXVx6x0EHyTli8uHR2nedRCjgzWHJVbGxlUIMEYb5Z4o fopMlw+ZoDSm6am5gQrsxWftiPdi X-Google-Smtp-Source: ACJfBotspu4nm/RYn25LR3Fzw63fCi1Arz6Ct4AfTNdpv1ipDUvAyRFgUNZdFZoKdvWyNCQgSDQhiw== X-Received: by 10.223.199.205 with SMTP id y13mr2177395wrg.114.1516188325013; Wed, 17 Jan 2018 03:25:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 17 Jan 2018 12:25:07 +0100 Message-Id: <1516188312-29612-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516188312-29612-1-git-send-email-pbonzini@redhat.com> References: <1516188312-29612-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH 2/7] qcow2: make qcow2_co_create2() a coroutine_fn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Stefan Hajnoczi , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Stefan Hajnoczi qcow2_create2() calls qemu_co_mutex_lock(). Only a coroutine_fn may call another coroutine_fn. Rename the function (the block layer API is now called .bdrv_co_create()) and add coroutine_fn. It is always called from coroutine context. Reported-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Stefan Hajnoczi Message-Id: <20170705102231.20711-3-stefanha@redhat.com> Signed-off-by: Paolo Bonzini --- block/qcow2.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index be2d485..fec065b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2690,11 +2690,12 @@ static uint64_t qcow2_opt_get_refcount_bits_del(Qem= uOpts *opts, int version, return refcount_bits; } =20 -static int qcow2_create2(const char *filename, int64_t total_size, - const char *backing_file, const char *backing_for= mat, - int flags, size_t cluster_size, PreallocMode prea= lloc, - QemuOpts *opts, int version, int refcount_order, - const char *encryptfmt, Error **errp) +static int coroutine_fn +qcow2_co_create2(const char *filename, int64_t total_size, + const char *backing_file, const char *backing_format, + int flags, size_t cluster_size, PreallocMode prealloc, + QemuOpts *opts, int version, int refcount_order, + const char *encryptfmt, Error **errp) { QDict *options; =20 @@ -2963,9 +2964,9 @@ static int coroutine_fn qcow2_co_create(const char *f= ilename, QemuOpts *opts, =20 refcount_order =3D ctz32(refcount_bits); =20 - ret =3D qcow2_create2(filename, size, backing_file, backing_fmt, flags, - cluster_size, prealloc, opts, version, refcount_or= der, - encryptfmt, &local_err); + ret =3D qcow2_co_create2(filename, size, backing_file, backing_fmt, fl= ags, + cluster_size, prealloc, opts, version, refcount= _order, + encryptfmt, &local_err); error_propagate(errp, local_err); =20 finish: --=20 1.8.3.1