From nobody Mon Feb 9 20:54:48 2026 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 1516187021336740.8120963169397; Wed, 17 Jan 2018 03:03:41 -0800 (PST) Received: from localhost ([::1]:55296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eblVM-0002rh-9a for importer@patchew.org; Wed, 17 Jan 2018 06:03:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eblSt-0001Oh-Bg for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:01:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eblSs-0003Av-JS for qemu-devel@nongnu.org; Wed, 17 Jan 2018 06:01:07 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:39089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eblSs-00039n-D1; Wed, 17 Jan 2018 06:01:06 -0500 Received: by mail-wm0-x243.google.com with SMTP id i11so14714335wmf.4; Wed, 17 Jan 2018 03:01:06 -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 o12sm3996897wrf.81.2018.01.17.03.01.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2018 03:01:03 -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=X/LsKMajvW1W25O0js16MdK1bumwQtDxxiIpBRXgUi57esNByNwRU1WKgYiFmUrn8R vqOpdrHQO2YmZcWO+9GXO+RYLKwgSpyh0q6ZTtBBh1blCFD6KIiglOMBJU0q7PXIsSAP h/9Soz75I2LGDuC23Meo9QSUoTFiRQ0hwc/vlxPOrQ1n0U4FDgqw1hFQwYGsv+Nl9apb Eiujrot9nfbYO7TUIcrMfxgASfm8BWDOJDNzhi3QxEW7lSSPcCwS0XFQO1U52WerTXq4 j7VsgyzleUVGeVYvo0/2Y4OxpDWwMLvgJLo8Cd4hFVJvlLXc+A413B5X73TAYkJtnoEk aeCQ== 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=I78IIJR6WvfwKs9aE1Y4P/T0cX09pjB+QNDQhENOU3v3K3+C3U8AT4V6ok8K/T7kTv p9IO4FMFWmaGtzaZQ9uD3mfjPG1n3IcR1SoWomMOtXJlKzCRK4vYY5C+bbKy44/phjPR Af2YuHIuMw3xx2YgeRCuKoNkkw66OY+6UbLgHld+L/849X3D+fB8kLqaJnVBsgPDrplA VQ9K7Ccsbu1A0CSuaJlPkn1wLU01p97C9AZcRUlo5MNlbd70Rh7kfBuiWphijiLWvDm1 DyGhuXo0sidxokDx/M6S8i+BS6+Yb3lNaJjgKXaRH6QhvTKXyRSw5yJzb6YdjYhLposq OqsA== X-Gm-Message-State: AKwxytcuM8LEj28hbN5cgAK/2E3L7sz2tMlah5168brFINuDLD6hx4eC q6qngDCHR2VgRAkkRyDVHW9MiUWG X-Google-Smtp-Source: ACJfBotk5AQ9eSWZ6oaj2xAlyHoAoyLtKEgNpYiC7a1s0/3XbB8xePdzSvmdvR+22y1WO2GDxjHBgQ== X-Received: by 10.28.210.149 with SMTP id j143mr1692743wmg.48.1516186864909; Wed, 17 Jan 2018 03:01:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 17 Jan 2018 12:00:46 +0100 Message-Id: <1516186851-23896-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1516186851-23896-1-git-send-email-pbonzini@redhat.com> References: <1516186851-23896-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:c09::243 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