From nobody Sat Apr 12 12:18:55 2025 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=1687961881; cv=none; d=zohomail.com; s=zohoarc; b=YPUr35XtW0QQC/g/NpT5/5hUYQC4142jX1RhbfNkvW6HI0f0XdBChugLJv4bZDbGBrE9Tz2an7X3jgEOosEU2eekUVOUK+4J1DNRqb6ulIC9Y0PBrcTLqa3VEFlXqpk9s+jlTTY/QjG7NtFqN70zLVmS8wf6Mj2JEdZiDDLZ8mQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687961881; 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=Oo+cUqmb0AL9IoU32J7leeMXK4Px5r2O7Pk3x1KmaIk=; b=lRomOG+gvt2KQy8DVqqXvWBKLcAN1/U6REHJ7mUEQmj82KtEyCUgcpccOGo5MGPgQ+dG72n6751rjDTbOjo3YibWziJ6Q4axr2YXuenCbUvyGBfcXI8cBN7y2j1E40oZN0fbISUMhhjE6E7O1vzESJa8nV2sROE1Ji/D3tN/abo= 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 1687961881308881.6226020292245; Wed, 28 Jun 2023 07:18:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEVyh-0001fT-N2; Wed, 28 Jun 2023 10:17:03 -0400 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 1qEVyg-0001Y3-5v for qemu-devel@nongnu.org; Wed, 28 Jun 2023 10:17:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEVye-0005Wz-Ak for qemu-devel@nongnu.org; Wed, 28 Jun 2023 10:17:01 -0400 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-584-7AYjH2QKMuCX_2WlvPj9WQ-1; Wed, 28 Jun 2023 10:16:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6CC6D1C04B79; Wed, 28 Jun 2023 14:16:02 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA2CD40C2063; Wed, 28 Jun 2023 14:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687961819; 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=Oo+cUqmb0AL9IoU32J7leeMXK4Px5r2O7Pk3x1KmaIk=; b=giTKjv/gCgqoZ6V91sEAGhmF15Hm+idLz0xBzG0kvMhA593bOJBO+Sopvw+UG+L4krXyzS Vx2RMDYJMwHLryZiGZs8+P6gUfRmwuP3iUJJbkvgOn7UOGK818i/2uDCtGztUMjUbl9qzo ezAg6O3V6LwJ/1PJS/beDQ1HJa5gGG0= X-MC-Unique: 7AYjH2QKMuCX_2WlvPj9WQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org Subject: [PULL 22/23] block: use bdrv_co_getlength in coroutine context Date: Wed, 28 Jun 2023 16:15:25 +0200 Message-ID: <20230628141526.293104-23-kwolf@redhat.com> In-Reply-To: <20230628141526.293104-1-kwolf@redhat.com> References: <20230628141526.293104-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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.133.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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1687961882624100003 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini bdrv_co_getlength was recently introduced, with bdrv_getlength becoming a wrapper for use in unknown context. Switch to bdrv_co_getlength when possible. Signed-off-by: Paolo Bonzini Message-ID: <20230601115145.196465-12-pbonzini@redhat.com> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/io.c | 10 +++++----- block/parallels.c | 4 ++-- block/qcow.c | 6 +++--- block/vmdk.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/block/io.c b/block/io.c index 30748f0b59..b53253c7a7 100644 --- a/block/io.c +++ b/block/io.c @@ -1379,7 +1379,7 @@ bdrv_aligned_preadv(BdrvChild *child, BdrvTrackedRequ= est *req, } =20 /* Forward the request to the BlockDriver, possibly fragmenting it */ - total_bytes =3D bdrv_getlength(bs); + total_bytes =3D bdrv_co_getlength(bs); if (total_bytes < 0) { ret =3D total_bytes; goto out; @@ -2388,7 +2388,7 @@ bdrv_co_block_status(BlockDriverState *bs, bool want_= zero, assert(pnum); assert_bdrv_graph_readable(); *pnum =3D 0; - total_size =3D bdrv_getlength(bs); + total_size =3D bdrv_co_getlength(bs); if (total_size < 0) { ret =3D total_size; goto early_out; @@ -2408,7 +2408,7 @@ bdrv_co_block_status(BlockDriverState *bs, bool want_= zero, bytes =3D n; } =20 - /* Must be non-NULL or bdrv_getlength() would have failed */ + /* Must be non-NULL or bdrv_co_getlength() would have failed */ assert(bs->drv); has_filtered_child =3D bdrv_filter_child(bs); if (!bs->drv->bdrv_co_block_status && !has_filtered_child) { @@ -2546,7 +2546,7 @@ bdrv_co_block_status(BlockDriverState *bs, bool want_= zero, if (!cow_bs) { ret |=3D BDRV_BLOCK_ZERO; } else if (want_zero) { - int64_t size2 =3D bdrv_getlength(cow_bs); + int64_t size2 =3D bdrv_co_getlength(cow_bs); =20 if (size2 >=3D 0 && offset >=3D size2) { ret |=3D BDRV_BLOCK_ZERO; @@ -3592,7 +3592,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, i= nt64_t offset, bool exact, return ret; } =20 - old_size =3D bdrv_getlength(bs); + old_size =3D bdrv_co_getlength(bs); if (old_size < 0) { error_setg_errno(errp, -old_size, "Failed to get old image size"); return old_size; diff --git a/block/parallels.c b/block/parallels.c index 7c263d5085..18e34aef28 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -200,7 +200,7 @@ allocate_clusters(BlockDriverState *bs, int64_t sector_= num, assert(idx < s->bat_size && idx + to_allocate <=3D s->bat_size); =20 space =3D to_allocate * s->tracks; - len =3D bdrv_getlength(bs->file->bs); + len =3D bdrv_co_getlength(bs->file->bs); if (len < 0) { return len; } @@ -448,7 +448,7 @@ parallels_check_outside_image(BlockDriverState *bs, Bdr= vCheckResult *res, uint32_t i; int64_t off, high_off, size; =20 - size =3D bdrv_getlength(bs->file->bs); + size =3D bdrv_co_getlength(bs->file->bs); if (size < 0) { res->check_errors++; return size; diff --git a/block/qcow.c b/block/qcow.c index 3644bbf5cb..cb240a5369 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -370,7 +370,7 @@ get_cluster_offset(BlockDriverState *bs, uint64_t offse= t, int allocate, if (!allocate) return 0; /* allocate a new l2 entry */ - l2_offset =3D bdrv_getlength(bs->file->bs); + l2_offset =3D bdrv_co_getlength(bs->file->bs); if (l2_offset < 0) { return l2_offset; } @@ -445,7 +445,7 @@ get_cluster_offset(BlockDriverState *bs, uint64_t offse= t, int allocate, if (decompress_cluster(bs, cluster_offset) < 0) { return -EIO; } - cluster_offset =3D bdrv_getlength(bs->file->bs); + cluster_offset =3D bdrv_co_getlength(bs->file->bs); if ((int64_t) cluster_offset < 0) { return cluster_offset; } @@ -458,7 +458,7 @@ get_cluster_offset(BlockDriverState *bs, uint64_t offse= t, int allocate, return ret; } } else { - cluster_offset =3D bdrv_getlength(bs->file->bs); + cluster_offset =3D bdrv_co_getlength(bs->file->bs); if ((int64_t) cluster_offset < 0) { return cluster_offset; } diff --git a/block/vmdk.c b/block/vmdk.c index 0410b895dc..234e671786 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -2132,7 +2132,7 @@ vmdk_co_pwritev_compressed(BlockDriverState *bs, int6= 4_t offset, int64_t bytes, int64_t length; =20 for (i =3D 0; i < s->num_extents; i++) { - length =3D bdrv_getlength(s->extents[i].file->bs); + length =3D bdrv_co_getlength(s->extents[i].file->bs); if (length < 0) { return length; } @@ -2939,7 +2939,7 @@ vmdk_co_check(BlockDriverState *bs, BdrvCheckResult *= result, BdrvCheckMode fix) break; } if (ret =3D=3D VMDK_OK) { - int64_t extent_len =3D bdrv_getlength(extent->file->bs); + int64_t extent_len =3D bdrv_co_getlength(extent->file->bs); if (extent_len < 0) { fprintf(stderr, "ERROR: could not get extent file length for secto= r %" --=20 2.41.0