From nobody Fri Oct 24 22:13:26 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519922319201709.7099991231315; Thu, 1 Mar 2018 08:38:39 -0800 (PST) Received: from localhost ([::1]:57989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erRE6-0007nA-5h for importer@patchew.org; Thu, 01 Mar 2018 11:38:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erRC5-0006WC-Lg for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:36:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erRC4-0002hK-ED for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:36:33 -0500 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:41584) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1erRC4-0002g9-6x; Thu, 01 Mar 2018 11:36:32 -0500 Received: by mail-wr0-x241.google.com with SMTP id f14so7220900wre.8; Thu, 01 Mar 2018 08:36:32 -0800 (PST) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id a14sm4187152wrf.22.2018.03.01.08.36.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Mar 2018 08:36:30 -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=XbPZ3fRZvxsXKcxJChiXiTp7JVinI8vYVhCzotn0YW8=; b=HvWYtmWewkPnn57esnNJpBaRgT+OFwHc2idPnOuocFtAe9gIQwS9+zNJZJpESP2Tg8 n2NheInmD0delLC+kWt4XJsDanx4Vy7zQg80KQudOA5cYkf+VaZxNBanty1OzX2RLMEf Bju0TWuleYDWQv1d86rkgclVPgN83fqeMCBmWY/90NuOysXucwBP+x1iuQDGTYv1aPPS Na4tyCD0cn3YBO0J3DpYPwN6jgrh9Y6woqVCqYUkO+qTLxD4LTVDgWAvorW+VMgrRzpO qvXwsw7WZ6AOLcwy8W6BiyaBwpqPgo8SvvWC/EyfAlrMJl8etEQ7zFvNI9VObVaZ2Qzy zw5w== 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=XbPZ3fRZvxsXKcxJChiXiTp7JVinI8vYVhCzotn0YW8=; b=eFkblXYwmZvOx1tQlIU6o7H0kzDFGsQ4bxR6U2H6LMJoOqNLzzMZyVYiwV6OWQrcVW 1LzI3TINvmvqcL0AVFgo360v9+bj9LT1fx9RyA7/AlpYZeBg/qJxOvkwxWHkQ1df7WUC fNby5NCmhC02CXI2h0lpUw5yIojPahNoeoCSy9EiaKWSLL+QR1Bnxq8e7y29jAU7AVYf R/L/vLkC+2en4IkoRXMfnGFGfWWrsQntflgpW6YMvDR4JLoRHMtLWR5idl18Yy0QirlR yhZgOw1eT2eMK+c0ecJzI3oYiRj2pET3dksJ6mRZ2+WerrSzMf3K1almYCtY7oiUWDsd QSOQ== X-Gm-Message-State: APf1xPDX4rLmEhbO41+cCQAZYOAV+SCPZ+0JvzVKPdGyChvzGO0bs2Jt cgLdcLypHRh3//my9e6n+FqMRM/u X-Google-Smtp-Source: AG47ELtj9ARagtPN0nHP2QlDBfBME5txr/rcVvU3k6fORJkBLKPV3pg5Hoiu4cRO1gCWrMYdruvtQA== X-Received: by 10.223.130.194 with SMTP id 60mr2470174wrc.209.1519922190872; Thu, 01 Mar 2018 08:36:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 17:36:13 +0100 Message-Id: <20180301163619.21072-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180301163619.21072-1-pbonzini@redhat.com> References: <20180301163619.21072-1-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/8] 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 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. In fact, qcow2_create2 is always called from coroutine context. Rename the function to add the "co" moniker and add coroutine_fn. 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 Message-Id: <1516279431-30424-3-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake --- block/qcow2.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index d62705d9aa..24edbb431b 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2700,11 +2700,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 @@ -2973,9 +2974,9 @@ static int coroutine_fn qcow2_co_create_opts(const ch= ar *filename, QemuOpts *opt =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 2.14.3