From nobody Tue May 13 11:49:27 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673642687; cv=none; d=zohomail.com; s=zohoarc; b=OTpNsn52tIVliB+rYRDEp5RfxrsnzAQnuLN5WX1qi1VYUjNhU4upHVlr5vcS1FEgefPvs/RbOUuy3TliGGutLCGrbFdFjvUuf6uhEc6q7rs5lJ0ZvNwioEopga0syDirff0SM76/Jx/HQcdUe00ztu12ZoRSVUIvuUycZqAs63o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673642687; 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=qEFdT+64m/Zt6OcrqolD720WMNagtS1mk6rPtOnmYOQ=; b=HrSK5yVmh2R1pVhdCTSqRVkrABii4TLYbFGdR4j6c5uh4mL9NY4N0GGYipY4WEZZM0pTxgAcr0pJQwUT7aSuTNjkOznkBAijy3s/vLn/gdSNp78zxl7RcdZLySz4LDFP9YhlBBxvpDwV2KKH3alGzyydSzd1gz25A7xSKosqcKg= 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+importer2=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 1673642687912451.2775338574305; Fri, 13 Jan 2023 12:44:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGQt8-0000CM-Uw; Fri, 13 Jan 2023 15:42:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGQt7-0000BL-7G for qemu-devel@nongnu.org; Fri, 13 Jan 2023 15:42:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGQt5-0006F7-KY for qemu-devel@nongnu.org; Fri, 13 Jan 2023 15:42:56 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-331-Ih6ID9y7P6ugWlYHu1UXDA-1; Fri, 13 Jan 2023 15:42:51 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 821D2281DE7C; Fri, 13 Jan 2023 20:42:51 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 560532026D68; Fri, 13 Jan 2023 20:42:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673642575; 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=qEFdT+64m/Zt6OcrqolD720WMNagtS1mk6rPtOnmYOQ=; b=XxgN9FZysnl7J9F0uoeuV8yuNwqxharaJJpzmfOA+oPrNqiHT3WgXmGIe7nl8+dIAcydfl jcd6TbJtXkNgokOWOgFGkEGammRe3WqtlJHWgvfXTyd0f+hq9FoSYsUZTJPUxGK1J8M55L 6P0b0AgzPuAk/rN1Y19C8fXYIBHEmJ4= X-MC-Unique: Ih6ID9y7P6ugWlYHu1UXDA-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, eesposit@redhat.com, pbonzini@redhat.com, vsementsov@yandex-team.ru, qemu-devel@nongnu.org Subject: [PATCH v2 14/14] block: Rename bdrv_load/save_vmstate() to bdrv_co_load/save_vmstate() Date: Fri, 13 Jan 2023 21:42:12 +0100 Message-Id: <20230113204212.359076-15-kwolf@redhat.com> In-Reply-To: <20230113204212.359076-1-kwolf@redhat.com> References: <20230113204212.359076-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673642688850100010 Content-Type: text/plain; charset="utf-8" From: Emanuele Giuseppe Esposito Since these functions always run in coroutine context, adjust their name to include "_co_", just like all other BlockDriver callbacks. No functional change intended. Signed-off-by: Emanuele Giuseppe Esposito Signed-off-by: Kevin Wolf --- include/block/block_int-common.h | 4 ++-- block/io.c | 8 ++++---- block/qcow2.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 93d4350f24..fd8ccaefee 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -704,10 +704,10 @@ struct BlockDriver { Error **errp); BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs); =20 - int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_save_vmstate)( + int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_save_vmstate)( BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); =20 - int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_load_vmstate)( + int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_load_vmstate)( BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); =20 /* removable device specific */ diff --git a/block/io.c b/block/io.c index cd1cea2515..445c757c2a 100644 --- a/block/io.c +++ b/block/io.c @@ -2719,8 +2719,8 @@ bdrv_co_readv_vmstate(BlockDriverState *bs, QEMUIOVec= tor *qiov, int64_t pos) =20 bdrv_inc_in_flight(bs); =20 - if (drv->bdrv_load_vmstate) { - ret =3D drv->bdrv_load_vmstate(bs, qiov, pos); + if (drv->bdrv_co_load_vmstate) { + ret =3D drv->bdrv_co_load_vmstate(bs, qiov, pos); } else if (child_bs) { ret =3D bdrv_co_readv_vmstate(child_bs, qiov, pos); } else { @@ -2752,8 +2752,8 @@ bdrv_co_writev_vmstate(BlockDriverState *bs, QEMUIOVe= ctor *qiov, int64_t pos) =20 bdrv_inc_in_flight(bs); =20 - if (drv->bdrv_save_vmstate) { - ret =3D drv->bdrv_save_vmstate(bs, qiov, pos); + if (drv->bdrv_co_save_vmstate) { + ret =3D drv->bdrv_co_save_vmstate(bs, qiov, pos); } else if (child_bs) { ret =3D bdrv_co_writev_vmstate(child_bs, qiov, pos); } else { diff --git a/block/qcow2.c b/block/qcow2.c index 460579b70a..ce644dfc59 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -5286,8 +5286,8 @@ static int64_t qcow2_check_vmstate_request(BlockDrive= rState *bs, return pos; } =20 -static coroutine_fn int qcow2_save_vmstate(BlockDriverState *bs, - QEMUIOVector *qiov, int64_t pos) +static coroutine_fn int qcow2_co_save_vmstate(BlockDriverState *bs, + QEMUIOVector *qiov, int64_t = pos) { int64_t offset =3D qcow2_check_vmstate_request(bs, qiov, pos); if (offset < 0) { @@ -5298,8 +5298,8 @@ static coroutine_fn int qcow2_save_vmstate(BlockDrive= rState *bs, return bs->drv->bdrv_co_pwritev_part(bs, offset, qiov->size, qiov, 0, = 0); } =20 -static coroutine_fn int qcow2_load_vmstate(BlockDriverState *bs, - QEMUIOVector *qiov, int64_t pos) +static coroutine_fn int qcow2_co_load_vmstate(BlockDriverState *bs, + QEMUIOVector *qiov, int64_t = pos) { int64_t offset =3D qcow2_check_vmstate_request(bs, qiov, pos); if (offset < 0) { @@ -6080,8 +6080,8 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_co_get_info =3D qcow2_co_get_info, .bdrv_get_specific_info =3D qcow2_get_specific_info, =20 - .bdrv_save_vmstate =3D qcow2_save_vmstate, - .bdrv_load_vmstate =3D qcow2_load_vmstate, + .bdrv_co_save_vmstate =3D qcow2_co_save_vmstate, + .bdrv_co_load_vmstate =3D qcow2_co_load_vmstate, =20 .is_format =3D true, .supports_backing =3D true, --=20 2.38.1