From nobody Mon Feb 9 05:18:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652972983; cv=none; d=zohomail.com; s=zohoarc; b=QWoRC7md+fG4CeJr3/zwVCnE9Kqh1mu8EjZZGRbvbyzPn0CUpp1SF/CSuVpDYV8ggoeR8EobO0cnxZFJxnJPXfSwEgIRAw69Q0rRU2haBPpLx1IVnqiY+EdWWEHqgn0q59zGOq24zo65Yk5LSu6salixw5sfhrtYqkmA6F4Fgdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652972983; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aXuojH7qaiz5OlVUW21ydihwYkyvvFZ9rUfCNGLVOZ4=; b=AVwq6aVhDUPl2sqcDvkpSAxcPryWErZn+8zvx8ZGH0fKciyT3yGxi0FfikE2czn2xlLqd1oZr7iflq8V5tS01E3Co1pbjmeH6xLyhwp9ZSHYjGiNGti/r5G4h0tJiiwMgdX+BIqr2DOrFERMiBET6A2iZMCotUP/LsF/5mAVeoo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652972983974460.1376702260536; Thu, 19 May 2022 08:09:43 -0700 (PDT) Received: from localhost ([::1]:54374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrhmY-0007cP-CC for importer@patchew.org; Thu, 19 May 2022 11:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrhSs-00077Y-71 for qemu-devel@nongnu.org; Thu, 19 May 2022 10:49:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:33659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrhSq-0000zz-F3 for qemu-devel@nongnu.org; Thu, 19 May 2022 10:49:21 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-339-dA8v_hNBN7-TJ8jOAIYSog-1; Thu, 19 May 2022 10:49:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A71C1010368; Thu, 19 May 2022 14:49:13 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.192.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 853CC400E115; Thu, 19 May 2022 14:49:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652971758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aXuojH7qaiz5OlVUW21ydihwYkyvvFZ9rUfCNGLVOZ4=; b=StcdichXfZ8gAb+Gu7sFIjtDoL7z+C69jD5lp06W364kg5XwVT2GyuWCu1W3ZUSRcN+Zho rCpSCDU8q4iyQScErnrrSDpSXg1c8LgPArwoCSAxSSyt90QRSx9+UsnhnZnWc51H6w4qe9 mSkCuVm4YprLqjxq36VY6eky8ZQtttI= X-MC-Unique: dA8v_hNBN7-TJ8jOAIYSog-1 From: Alberto Faria To: qemu-devel@nongnu.org Cc: "Denis V. Lunev" , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org, Kevin Wolf , Stefan Hajnoczi , John Snow , Hanna Reitz , Eric Blake , Stefan Weil , Jeff Cody , Fam Zheng , Ari Sundholm , Alberto Faria Subject: [PATCH v3 09/10] block: Use bdrv_co_pwrite_sync() when caller is coroutine_fn Date: Thu, 19 May 2022 15:48:39 +0100 Message-Id: <20220519144841.784780-10-afaria@redhat.com> In-Reply-To: <20220519144841.784780-1-afaria@redhat.com> References: <20220519144841.784780-1-afaria@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=afaria@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652972986874100001 Content-Type: text/plain; charset="utf-8" Convert uses of bdrv_pwrite_sync() into bdrv_co_pwrite_sync() when the callers are already coroutine_fn. Signed-off-by: Alberto Faria Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Hajnoczi --- block/parallels.c | 2 +- block/qcow2-snapshot.c | 6 +++--- block/qcow2.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index f22444efff..8b23b9580d 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -481,7 +481,7 @@ static int coroutine_fn parallels_co_check(BlockDriverS= tate *bs, =20 ret =3D 0; if (flush_bat) { - ret =3D bdrv_pwrite_sync(bs->file, 0, s->header_size, s->header, 0= ); + ret =3D bdrv_co_pwrite_sync(bs->file, 0, s->header_size, s->header= , 0); if (ret < 0) { res->check_errors++; goto out; diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 60e0461632..d1d46facbf 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -512,9 +512,9 @@ int coroutine_fn qcow2_check_read_snapshot_table(BlockD= riverState *bs, assert(fix & BDRV_FIX_ERRORS); =20 snapshot_table_pointer.nb_snapshots =3D cpu_to_be32(s->nb_snapshot= s); - ret =3D bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snapsho= ts), - sizeof(snapshot_table_pointer.nb_snapshots), - &snapshot_table_pointer.nb_snapshots, 0); + ret =3D bdrv_co_pwrite_sync(bs->file, offsetof(QCowHeader, nb_snap= shots), + sizeof(snapshot_table_pointer.nb_snapsho= ts), + &snapshot_table_pointer.nb_snapshots, 0); if (ret < 0) { result->check_errors++; fprintf(stderr, "ERROR failed to update the snapshot count in = the " diff --git a/block/qcow2.c b/block/qcow2.c index c43238a006..f2fb54c51f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4551,8 +4551,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriver= State *bs, int64_t offset, =20 /* write updated header.size */ offset =3D cpu_to_be64(offset); - ret =3D bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size), - sizeof(offset), &offset, 0); + ret =3D bdrv_co_pwrite_sync(bs->file, offsetof(QCowHeader, size), + sizeof(offset), &offset, 0); if (ret < 0) { error_setg_errno(errp, -ret, "Failed to update the image size"); goto fail; --=20 2.35.3