From nobody Mon Feb 9 10:32:43 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=1670923131; cv=none; d=zohomail.com; s=zohoarc; b=asD5RY3CgEUwEkO73zDxOjGeZB7uY+7+0uJRdDfcGF/lwR737X8f/FmV9SsjYGsUek+zxFrNR8UEdH7wa36I8a5Lv7kqflotp9xq0nADpIiAyWq6pstONNegbwkK/ovHkZbLX+bAY+NzYUCtoGf4zlJoCD1VlSZYpkDp7aq/eYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670923131; 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=2+TYZzo8pqnY8mQpnUUd5NfbckTXbYQsMz3OlzRevEY=; b=gss4EV0Le3JJO1cWpg0LBVYoruxZ+StoZ2iO77l6FU1b/m5lJqjtfn5V0BEb1IV0Bh2kSGlSn5HjTuApapb2OwiwV/7kVTnNs/AFWfApSQe40YKm/1FXIgse3HsIJB0KP1v5KsoxE4jUYgRtYZ40AC6MF7cvkIuOgK8fb/6ETAI= 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 1670923131314125.03383712153561; Tue, 13 Dec 2022 01:18:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5132-0006Uw-Lx; Tue, 13 Dec 2022 03:54:00 -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 1p5130-0006TZ-EJ for qemu-devel@nongnu.org; Tue, 13 Dec 2022 03:53:58 -0500 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 1p512w-00032Y-VX for qemu-devel@nongnu.org; Tue, 13 Dec 2022 03:53:58 -0500 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-330-kJ9frqZ9NQSThq5GRmBPjA-1; Tue, 13 Dec 2022 03:53:51 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D43785A59D; Tue, 13 Dec 2022 08:53:50 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.192.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8F48492C14; Tue, 13 Dec 2022 08:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670921634; 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=2+TYZzo8pqnY8mQpnUUd5NfbckTXbYQsMz3OlzRevEY=; b=VIHH+2apiG11/5IpfZoxjyR+/I9xFR7dmswYxeqpmNfcUHZ/AKBHCEXCKvUlrhwOWpAarg Tu/daDagkYLlwv1g5OsbzsxN67uFcsMiBGNl5r/PrAifmyvClbdZMoD7rXw9ElYCBarQre /fRAGm5nb+8lmXNfHQ4apMGJ1MYIejM= X-MC-Unique: kJ9frqZ9NQSThq5GRmBPjA-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 14/14] block: Rename newly converted BlockDriver IO coroutine functions Date: Tue, 13 Dec 2022 09:53:20 +0100 Message-Id: <20221213085320.95673-15-kwolf@redhat.com> In-Reply-To: <20221213085320.95673-1-kwolf@redhat.com> References: <20221213085320.95673-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1670923133131100003 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 | 27 +++++++++--------- block.c | 32 ++++++++++----------- block/blkdebug.c | 4 +-- block/blkio.c | 6 ++-- block/blklogwrites.c | 2 +- block/blkreplay.c | 2 +- block/blkverify.c | 2 +- block/copy-on-read.c | 6 ++-- block/crypto.c | 4 +-- block/curl.c | 8 +++--- block/file-posix.c | 48 ++++++++++++++++---------------- block/file-win32.c | 12 ++++---- block/filter-compress.c | 6 ++-- block/gluster.c | 16 +++++------ block/io.c | 16 +++++------ block/iscsi.c | 8 +++--- block/nbd.c | 6 ++-- block/nfs.c | 2 +- block/null.c | 8 +++--- block/nvme.c | 6 ++-- block/preallocate.c | 2 +- block/qcow.c | 2 +- block/qcow2.c | 6 ++-- block/qed.c | 4 +-- block/quorum.c | 2 +- block/raw-format.c | 8 +++--- block/rbd.c | 4 +-- block/replication.c | 2 +- block/ssh.c | 2 +- block/throttle.c | 2 +- block/vdi.c | 2 +- block/vhdx.c | 2 +- block/vmdk.c | 4 +-- block/vpc.c | 2 +- 34 files changed, 132 insertions(+), 133 deletions(-) diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 90702c6dcf..fd8ccaefee 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -684,8 +684,9 @@ struct BlockDriver { int coroutine_fn (*bdrv_co_truncate)(BlockDriverState *bs, int64_t off= set, bool exact, PreallocMode prealloc, BdrvRequestFlags flags, Error **e= rrp); - int64_t coroutine_fn (*bdrv_getlength)(BlockDriverState *bs); - int64_t coroutine_fn (*bdrv_get_allocated_file_size)(BlockDriverState = *bs); + int64_t coroutine_fn (*bdrv_co_getlength)(BlockDriverState *bs); + int64_t coroutine_fn (*bdrv_co_get_allocated_file_size)( + BlockDriverState *bs); =20 BlockMeasureInfo *(*bdrv_measure)(QemuOpts *opts, BlockDriverState *in= _bs, Error **errp); @@ -696,23 +697,23 @@ struct BlockDriver { int64_t offset, int64_t bytes, QEMUIOVector *qiov, size_t qiov_offset); =20 - int coroutine_fn (*bdrv_get_info)(BlockDriverState *bs, - BlockDriverInfo *bdi); + int coroutine_fn (*bdrv_co_get_info)(BlockDriverState *bs, + BlockDriverInfo *bdi); =20 ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs, 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 */ - bool coroutine_fn (*bdrv_is_inserted)(BlockDriverState *bs); - void coroutine_fn (*bdrv_eject)(BlockDriverState *bs, bool eject_flag); - void coroutine_fn (*bdrv_lock_medium)(BlockDriverState *bs, bool locke= d); + bool coroutine_fn (*bdrv_co_is_inserted)(BlockDriverState *bs); + void coroutine_fn (*bdrv_co_eject)(BlockDriverState *bs, bool eject_fl= ag); + void coroutine_fn (*bdrv_co_lock_medium)(BlockDriverState *bs, bool lo= cked); =20 /* to control generic scsi devices */ BlockAIOCB *(*bdrv_aio_ioctl)(BlockDriverState *bs, @@ -728,12 +729,12 @@ struct BlockDriver { int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_check)( BlockDriverState *bs, BdrvCheckResult *result, BdrvCheckMode fix); =20 - void coroutine_fn (*bdrv_debug_event)(BlockDriverState *bs, - BlkdebugEvent event); + void coroutine_fn (*bdrv_co_debug_event)(BlockDriverState *bs, + BlkdebugEvent event); =20 /* io queue for linux-aio */ - void coroutine_fn (*bdrv_io_plug)(BlockDriverState *bs); - void coroutine_fn (*bdrv_io_unplug)(BlockDriverState *bs); + void coroutine_fn (*bdrv_co_io_plug)(BlockDriverState *bs); + void coroutine_fn (*bdrv_co_io_unplug)(BlockDriverState *bs); =20 /** * bdrv_drain_begin is called if implemented in the beginning of a diff --git a/block.c b/block.c index d27105dd3b..eebb4560c4 100644 --- a/block.c +++ b/block.c @@ -1044,13 +1044,13 @@ int coroutine_fn bdrv_co_refresh_total_sectors(Bloc= kDriverState *bs, return -ENOMEDIUM; } =20 - /* Do not attempt drv->bdrv_getlength() on scsi-generic devices */ + /* Do not attempt drv->bdrv_co_getlength() on scsi-generic devices */ if (bdrv_is_sg(bs)) return 0; =20 /* query actual device if possible, otherwise just trust the hint */ - if (drv->bdrv_getlength) { - int64_t length =3D drv->bdrv_getlength(bs); + if (drv->bdrv_co_getlength) { + int64_t length =3D drv->bdrv_co_getlength(bs); if (length < 0) { return length; } @@ -5719,7 +5719,7 @@ exit: } =20 /** - * Implementation of BlockDriver.bdrv_get_allocated_file_size() that + * Implementation of BlockDriver.bdrv_co_get_allocated_file_size() that * sums the size of all data-bearing children. (This excludes backing * children.) */ @@ -5755,8 +5755,8 @@ int64_t coroutine_fn bdrv_co_get_allocated_file_size(= BlockDriverState *bs) if (!drv) { return -ENOMEDIUM; } - if (drv->bdrv_get_allocated_file_size) { - return drv->bdrv_get_allocated_file_size(bs); + if (drv->bdrv_co_get_allocated_file_size) { + return drv->bdrv_co_get_allocated_file_size(bs); } =20 if (drv->bdrv_file_open) { @@ -6309,7 +6309,7 @@ int coroutine_fn bdrv_co_get_info(BlockDriverState *b= s, BlockDriverInfo *bdi) if (!drv) { return -ENOMEDIUM; } - if (!drv->bdrv_get_info) { + if (!drv->bdrv_co_get_info) { BlockDriverState *filtered =3D bdrv_filter_bs(bs); if (filtered) { return bdrv_co_get_info(filtered, bdi); @@ -6317,7 +6317,7 @@ int coroutine_fn bdrv_co_get_info(BlockDriverState *b= s, BlockDriverInfo *bdi) return -ENOTSUP; } memset(bdi, 0, sizeof(*bdi)); - ret =3D drv->bdrv_get_info(bs, bdi); + ret =3D drv->bdrv_co_get_info(bs, bdi); if (ret < 0) { return ret; } @@ -6353,11 +6353,11 @@ BlockStatsSpecific *bdrv_get_specific_stats(BlockDr= iverState *bs) void coroutine_fn bdrv_co_debug_event(BlockDriverState *bs, BlkdebugEvent = event) { IO_CODE(); - if (!bs || !bs->drv || !bs->drv->bdrv_debug_event) { + if (!bs || !bs->drv || !bs->drv->bdrv_co_debug_event) { return; } =20 - bs->drv->bdrv_debug_event(bs, event); + bs->drv->bdrv_co_debug_event(bs, event); } =20 static BlockDriverState *bdrv_find_debug_node(BlockDriverState *bs) @@ -6806,8 +6806,8 @@ bool coroutine_fn bdrv_co_is_inserted(BlockDriverStat= e *bs) if (!drv) { return false; } - if (drv->bdrv_is_inserted) { - return drv->bdrv_is_inserted(bs); + if (drv->bdrv_co_is_inserted) { + return drv->bdrv_co_is_inserted(bs); } QLIST_FOREACH(child, &bs->children, next) { if (!bdrv_co_is_inserted(child->bs)) { @@ -6825,8 +6825,8 @@ void coroutine_fn bdrv_co_eject(BlockDriverState *bs,= bool eject_flag) BlockDriver *drv =3D bs->drv; IO_CODE(); =20 - if (drv && drv->bdrv_eject) { - drv->bdrv_eject(bs, eject_flag); + if (drv && drv->bdrv_co_eject) { + drv->bdrv_co_eject(bs, eject_flag); } } =20 @@ -6840,8 +6840,8 @@ void coroutine_fn bdrv_co_lock_medium(BlockDriverStat= e *bs, bool locked) IO_CODE(); trace_bdrv_lock_medium(bs, locked); =20 - if (drv && drv->bdrv_lock_medium) { - drv->bdrv_lock_medium(bs, locked); + if (drv && drv->bdrv_co_lock_medium) { + drv->bdrv_co_lock_medium(bs, locked); } } =20 diff --git a/block/blkdebug.c b/block/blkdebug.c index 4265ca125e..d8e199d59c 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -1076,7 +1076,7 @@ static BlockDriver bdrv_blkdebug =3D { .bdrv_reopen_prepare =3D blkdebug_reopen_prepare, .bdrv_child_perm =3D blkdebug_child_perm, =20 - .bdrv_getlength =3D blkdebug_getlength, + .bdrv_co_getlength =3D blkdebug_getlength, .bdrv_refresh_filename =3D blkdebug_refresh_filename, .bdrv_refresh_limits =3D blkdebug_refresh_limits, =20 @@ -1087,7 +1087,7 @@ static BlockDriver bdrv_blkdebug =3D { .bdrv_co_pdiscard =3D blkdebug_co_pdiscard, .bdrv_co_block_status =3D blkdebug_co_block_status, =20 - .bdrv_debug_event =3D blkdebug_debug_event, + .bdrv_co_debug_event =3D blkdebug_debug_event, .bdrv_debug_breakpoint =3D blkdebug_debug_breakpoint, .bdrv_debug_remove_breakpoint =3D blkdebug_debug_remove_breakpoint, diff --git a/block/blkio.c b/block/blkio.c index 5eae3adfaf..83ee4e9cce 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -996,9 +996,9 @@ static void blkio_refresh_limits(BlockDriverState *bs, = Error **errp) .instance_size =3D sizeof(BDRVBlkioState), \ .bdrv_file_open =3D blkio_file_open, \ .bdrv_close =3D blkio_close, \ - .bdrv_getlength =3D blkio_getlength, \ + .bdrv_co_getlength =3D blkio_getlength, \ .bdrv_co_truncate =3D blkio_truncate, \ - .bdrv_get_info =3D blkio_get_info, \ + .bdrv_co_get_info =3D blkio_get_info, \ .bdrv_attach_aio_context =3D blkio_attach_aio_context, \ .bdrv_detach_aio_context =3D blkio_detach_aio_context, \ .bdrv_co_pdiscard =3D blkio_co_pdiscard, \ @@ -1006,7 +1006,7 @@ static void blkio_refresh_limits(BlockDriverState *bs= , Error **errp) .bdrv_co_pwritev =3D blkio_co_pwritev, \ .bdrv_co_flush_to_disk =3D blkio_co_flush, \ .bdrv_co_pwrite_zeroes =3D blkio_co_pwrite_zeroes, \ - .bdrv_io_unplug =3D blkio_io_unplug, \ + .bdrv_co_io_unplug =3D blkio_io_unplug, \ .bdrv_refresh_limits =3D blkio_refresh_limits, \ .bdrv_register_buf =3D blkio_register_buf, \ .bdrv_unregister_buf =3D blkio_unregister_buf, \ diff --git a/block/blklogwrites.c b/block/blklogwrites.c index cef9efe55d..8b81e8f0d9 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -497,7 +497,7 @@ static BlockDriver bdrv_blk_log_writes =3D { =20 .bdrv_open =3D blk_log_writes_open, .bdrv_close =3D blk_log_writes_close, - .bdrv_getlength =3D blk_log_writes_getlength, + .bdrv_co_getlength =3D blk_log_writes_getlength, .bdrv_child_perm =3D blk_log_writes_child_perm, .bdrv_refresh_limits =3D blk_log_writes_refresh_limits, =20 diff --git a/block/blkreplay.c b/block/blkreplay.c index 76a0b8d12a..23f785a700 100644 --- a/block/blkreplay.c +++ b/block/blkreplay.c @@ -135,7 +135,7 @@ static BlockDriver bdrv_blkreplay =3D { =20 .bdrv_open =3D blkreplay_open, .bdrv_child_perm =3D bdrv_default_perms, - .bdrv_getlength =3D blkreplay_getlength, + .bdrv_co_getlength =3D blkreplay_getlength, =20 .bdrv_co_preadv =3D blkreplay_co_preadv, .bdrv_co_pwritev =3D blkreplay_co_pwritev, diff --git a/block/blkverify.c b/block/blkverify.c index c60a2dc624..55cb093993 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -313,7 +313,7 @@ static BlockDriver bdrv_blkverify =3D { .bdrv_file_open =3D blkverify_open, .bdrv_close =3D blkverify_close, .bdrv_child_perm =3D bdrv_default_perms, - .bdrv_getlength =3D blkverify_getlength, + .bdrv_co_getlength =3D blkverify_getlength, .bdrv_refresh_filename =3D blkverify_refresh_filename, .bdrv_dirname =3D blkverify_dirname, =20 diff --git a/block/copy-on-read.c b/block/copy-on-read.c index ccc767f37b..423dc5ea0b 100644 --- a/block/copy-on-read.c +++ b/block/copy-on-read.c @@ -249,7 +249,7 @@ static BlockDriver bdrv_copy_on_read =3D { .bdrv_close =3D cor_close, .bdrv_child_perm =3D cor_child_perm, =20 - .bdrv_getlength =3D cor_getlength, + .bdrv_co_getlength =3D cor_getlength, =20 .bdrv_co_preadv_part =3D cor_co_preadv_part, .bdrv_co_pwritev_part =3D cor_co_pwritev_part, @@ -257,8 +257,8 @@ static BlockDriver bdrv_copy_on_read =3D { .bdrv_co_pdiscard =3D cor_co_pdiscard, .bdrv_co_pwritev_compressed =3D cor_co_pwritev_compressed, =20 - .bdrv_eject =3D cor_eject, - .bdrv_lock_medium =3D cor_lock_medium, + .bdrv_co_eject =3D cor_eject, + .bdrv_co_lock_medium =3D cor_lock_medium, =20 .has_variable_length =3D true, .is_filter =3D true, diff --git a/block/crypto.c b/block/crypto.c index 1b4a9eb8e7..b134b7685f 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -953,9 +953,9 @@ static BlockDriver bdrv_crypto_luks =3D { .bdrv_refresh_limits =3D block_crypto_refresh_limits, .bdrv_co_preadv =3D block_crypto_co_preadv, .bdrv_co_pwritev =3D block_crypto_co_pwritev, - .bdrv_getlength =3D block_crypto_getlength, + .bdrv_co_getlength =3D block_crypto_getlength, .bdrv_measure =3D block_crypto_measure, - .bdrv_get_info =3D block_crypto_get_info_luks, + .bdrv_co_get_info =3D block_crypto_get_info_luks, .bdrv_get_specific_info =3D block_crypto_get_specific_info_luks, .bdrv_amend_options =3D block_crypto_amend_options_luks, .bdrv_co_amend =3D block_crypto_co_amend_luks, diff --git a/block/curl.c b/block/curl.c index cba4c4cac7..8076afb4d1 100644 --- a/block/curl.c +++ b/block/curl.c @@ -1001,7 +1001,7 @@ static BlockDriver bdrv_http =3D { .bdrv_parse_filename =3D curl_parse_filename, .bdrv_file_open =3D curl_open, .bdrv_close =3D curl_close, - .bdrv_getlength =3D curl_getlength, + .bdrv_co_getlength =3D curl_getlength, =20 .bdrv_co_preadv =3D curl_co_preadv, =20 @@ -1020,7 +1020,7 @@ static BlockDriver bdrv_https =3D { .bdrv_parse_filename =3D curl_parse_filename, .bdrv_file_open =3D curl_open, .bdrv_close =3D curl_close, - .bdrv_getlength =3D curl_getlength, + .bdrv_co_getlength =3D curl_getlength, =20 .bdrv_co_preadv =3D curl_co_preadv, =20 @@ -1039,7 +1039,7 @@ static BlockDriver bdrv_ftp =3D { .bdrv_parse_filename =3D curl_parse_filename, .bdrv_file_open =3D curl_open, .bdrv_close =3D curl_close, - .bdrv_getlength =3D curl_getlength, + .bdrv_co_getlength =3D curl_getlength, =20 .bdrv_co_preadv =3D curl_co_preadv, =20 @@ -1058,7 +1058,7 @@ static BlockDriver bdrv_ftps =3D { .bdrv_parse_filename =3D curl_parse_filename, .bdrv_file_open =3D curl_open, .bdrv_close =3D curl_close, - .bdrv_getlength =3D curl_getlength, + .bdrv_co_getlength =3D curl_getlength, =20 .bdrv_co_preadv =3D curl_co_preadv, =20 diff --git a/block/file-posix.c b/block/file-posix.c index b9647c5ffc..ce558ccd5d 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3321,14 +3321,14 @@ BlockDriver bdrv_file =3D { .bdrv_co_copy_range_from =3D raw_co_copy_range_from, .bdrv_co_copy_range_to =3D raw_co_copy_range_to, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, - .bdrv_io_unplug =3D raw_aio_unplug, + .bdrv_co_io_plug =3D raw_aio_plug, + .bdrv_co_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_getlength =3D raw_getlength, - .bdrv_get_info =3D raw_get_info, - .bdrv_get_allocated_file_size + .bdrv_co_getlength =3D raw_getlength, + .bdrv_co_get_info =3D raw_get_info, + .bdrv_co_get_allocated_file_size =3D raw_get_allocated_file_size, .bdrv_get_specific_stats =3D raw_get_specific_stats, .bdrv_check_perm =3D raw_check_perm, @@ -3693,14 +3693,14 @@ static BlockDriver bdrv_host_device =3D { .bdrv_co_copy_range_from =3D raw_co_copy_range_from, .bdrv_co_copy_range_to =3D raw_co_copy_range_to, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, - .bdrv_io_unplug =3D raw_aio_unplug, + .bdrv_co_io_plug =3D raw_aio_plug, + .bdrv_co_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_getlength =3D raw_getlength, - .bdrv_get_info =3D raw_get_info, - .bdrv_get_allocated_file_size + .bdrv_co_getlength =3D raw_getlength, + .bdrv_co_get_info =3D raw_get_info, + .bdrv_co_get_allocated_file_size =3D raw_get_allocated_file_size, .bdrv_get_specific_stats =3D hdev_get_specific_stats, .bdrv_check_perm =3D raw_check_perm, @@ -3817,20 +3817,20 @@ static BlockDriver bdrv_host_cdrom =3D { .bdrv_co_pwritev =3D raw_co_pwritev, .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, - .bdrv_io_unplug =3D raw_aio_unplug, + .bdrv_co_io_plug =3D raw_aio_plug, + .bdrv_co_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_getlength =3D raw_getlength, + .bdrv_co_getlength =3D raw_getlength, .has_variable_length =3D true, - .bdrv_get_allocated_file_size + .bdrv_co_get_allocated_file_size =3D raw_get_allocated_file_size, =20 /* removable device support */ - .bdrv_is_inserted =3D cdrom_is_inserted, - .bdrv_eject =3D cdrom_eject, - .bdrv_lock_medium =3D cdrom_lock_medium, + .bdrv_co_is_inserted =3D cdrom_is_inserted, + .bdrv_co_eject =3D cdrom_eject, + .bdrv_co_lock_medium =3D cdrom_lock_medium, =20 /* generic scsi device */ .bdrv_co_ioctl =3D hdev_co_ioctl, @@ -3947,20 +3947,20 @@ static BlockDriver bdrv_host_cdrom =3D { .bdrv_co_pwritev =3D raw_co_pwritev, .bdrv_co_flush_to_disk =3D raw_co_flush_to_disk, .bdrv_refresh_limits =3D raw_refresh_limits, - .bdrv_io_plug =3D raw_aio_plug, - .bdrv_io_unplug =3D raw_aio_unplug, + .bdrv_co_io_plug =3D raw_aio_plug, + .bdrv_co_io_unplug =3D raw_aio_unplug, .bdrv_attach_aio_context =3D raw_aio_attach_aio_context, =20 .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_getlength =3D raw_getlength, + .bdrv_co_getlength =3D raw_getlength, .has_variable_length =3D true, - .bdrv_get_allocated_file_size + .bdrv_co_get_allocated_file_size =3D raw_get_allocated_file_size, =20 /* removable device support */ - .bdrv_is_inserted =3D cdrom_is_inserted, - .bdrv_eject =3D cdrom_eject, - .bdrv_lock_medium =3D cdrom_lock_medium, + .bdrv_co_is_inserted =3D cdrom_is_inserted, + .bdrv_co_eject =3D cdrom_eject, + .bdrv_co_lock_medium =3D cdrom_lock_medium, }; #endif /* __FreeBSD__ */ =20 diff --git a/block/file-win32.c b/block/file-win32.c index ec9d64d0e4..b7eef73149 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -763,8 +763,8 @@ BlockDriver bdrv_file =3D { .bdrv_aio_flush =3D raw_aio_flush, =20 .bdrv_co_truncate =3D raw_co_truncate, - .bdrv_getlength =3D raw_getlength, - .bdrv_get_allocated_file_size + .bdrv_co_getlength =3D raw_getlength, + .bdrv_co_get_allocated_file_size =3D raw_get_allocated_file_size, =20 .create_opts =3D &raw_create_opts, @@ -932,11 +932,9 @@ static BlockDriver bdrv_host_device =3D { .bdrv_detach_aio_context =3D raw_detach_aio_context, .bdrv_attach_aio_context =3D raw_attach_aio_context, =20 - .bdrv_getlength =3D raw_getlength, - .has_variable_length =3D true, - - .bdrv_get_allocated_file_size - =3D raw_get_allocated_file_size, + .bdrv_co_getlength =3D raw_getlength, + .has_variable_length =3D true, + .bdrv_co_get_allocated_file_size =3D raw_get_allocated_file_size, }; =20 static void bdrv_file_init(void) diff --git a/block/filter-compress.c b/block/filter-compress.c index e10312c225..42676f1d8e 100644 --- a/block/filter-compress.c +++ b/block/filter-compress.c @@ -134,7 +134,7 @@ static BlockDriver bdrv_compress =3D { .bdrv_open =3D compress_open, .bdrv_child_perm =3D bdrv_default_perms, =20 - .bdrv_getlength =3D compress_getlength, + .bdrv_co_getlength =3D compress_getlength, =20 .bdrv_co_preadv_part =3D compress_co_preadv_part, .bdrv_co_pwritev_part =3D compress_co_pwritev_part, @@ -142,8 +142,8 @@ static BlockDriver bdrv_compress =3D { .bdrv_co_pdiscard =3D compress_co_pdiscard, .bdrv_refresh_limits =3D compress_refresh_limits, =20 - .bdrv_eject =3D compress_eject, - .bdrv_lock_medium =3D compress_lock_medium, + .bdrv_co_eject =3D compress_eject, + .bdrv_co_lock_medium =3D compress_lock_medium, =20 .has_variable_length =3D true, .is_filter =3D true, diff --git a/block/gluster.c b/block/gluster.c index 7c90f7ba4b..15624c0b47 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -1561,8 +1561,8 @@ static BlockDriver bdrv_gluster =3D { .bdrv_close =3D qemu_gluster_close, .bdrv_co_create =3D qemu_gluster_co_create, .bdrv_co_create_opts =3D qemu_gluster_co_create_opts, - .bdrv_getlength =3D qemu_gluster_getlength, - .bdrv_get_allocated_file_size =3D qemu_gluster_allocated_file_size, + .bdrv_co_getlength =3D qemu_gluster_getlength, + .bdrv_co_get_allocated_file_size =3D qemu_gluster_allocated_file_size, .bdrv_co_truncate =3D qemu_gluster_co_truncate, .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, @@ -1590,8 +1590,8 @@ static BlockDriver bdrv_gluster_tcp =3D { .bdrv_close =3D qemu_gluster_close, .bdrv_co_create =3D qemu_gluster_co_create, .bdrv_co_create_opts =3D qemu_gluster_co_create_opts, - .bdrv_getlength =3D qemu_gluster_getlength, - .bdrv_get_allocated_file_size =3D qemu_gluster_allocated_file_size, + .bdrv_co_getlength =3D qemu_gluster_getlength, + .bdrv_co_get_allocated_file_size =3D qemu_gluster_allocated_file_size, .bdrv_co_truncate =3D qemu_gluster_co_truncate, .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, @@ -1619,8 +1619,8 @@ static BlockDriver bdrv_gluster_unix =3D { .bdrv_close =3D qemu_gluster_close, .bdrv_co_create =3D qemu_gluster_co_create, .bdrv_co_create_opts =3D qemu_gluster_co_create_opts, - .bdrv_getlength =3D qemu_gluster_getlength, - .bdrv_get_allocated_file_size =3D qemu_gluster_allocated_file_size, + .bdrv_co_getlength =3D qemu_gluster_getlength, + .bdrv_co_get_allocated_file_size =3D qemu_gluster_allocated_file_size, .bdrv_co_truncate =3D qemu_gluster_co_truncate, .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, @@ -1654,8 +1654,8 @@ static BlockDriver bdrv_gluster_rdma =3D { .bdrv_close =3D qemu_gluster_close, .bdrv_co_create =3D qemu_gluster_co_create, .bdrv_co_create_opts =3D qemu_gluster_co_create_opts, - .bdrv_getlength =3D qemu_gluster_getlength, - .bdrv_get_allocated_file_size =3D qemu_gluster_allocated_file_size, + .bdrv_co_getlength =3D qemu_gluster_getlength, + .bdrv_co_get_allocated_file_size =3D qemu_gluster_allocated_file_size, .bdrv_co_truncate =3D qemu_gluster_co_truncate, .bdrv_co_readv =3D qemu_gluster_co_readv, .bdrv_co_writev =3D qemu_gluster_co_writev, diff --git a/block/io.c b/block/io.c index 93ba851c8c..7a5229e685 100644 --- a/block/io.c +++ b/block/io.c @@ -2710,8 +2710,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 { @@ -2743,8 +2743,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 { @@ -3138,8 +3138,8 @@ void coroutine_fn bdrv_co_io_plug(BlockDriverState *b= s) =20 if (qatomic_fetch_inc(&bs->io_plugged) =3D=3D 0) { BlockDriver *drv =3D bs->drv; - if (drv && drv->bdrv_io_plug) { - drv->bdrv_io_plug(bs); + if (drv && drv->bdrv_co_io_plug) { + drv->bdrv_co_io_plug(bs); } } } @@ -3152,8 +3152,8 @@ void coroutine_fn bdrv_co_io_unplug(BlockDriverState = *bs) assert(bs->io_plugged); if (qatomic_fetch_dec(&bs->io_plugged) =3D=3D 1) { BlockDriver *drv =3D bs->drv; - if (drv && drv->bdrv_io_unplug) { - drv->bdrv_io_unplug(bs); + if (drv && drv->bdrv_co_io_unplug) { + drv->bdrv_co_io_unplug(bs); } } =20 diff --git a/block/iscsi.c b/block/iscsi.c index a316d46d96..839fd0b6eb 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2433,8 +2433,8 @@ static BlockDriver bdrv_iscsi =3D { .bdrv_reopen_commit =3D iscsi_reopen_commit, .bdrv_co_invalidate_cache =3D iscsi_co_invalidate_cache, =20 - .bdrv_getlength =3D iscsi_getlength, - .bdrv_get_info =3D iscsi_get_info, + .bdrv_co_getlength =3D iscsi_getlength, + .bdrv_co_get_info =3D iscsi_get_info, .bdrv_co_truncate =3D iscsi_co_truncate, .bdrv_refresh_limits =3D iscsi_refresh_limits, =20 @@ -2472,8 +2472,8 @@ static BlockDriver bdrv_iser =3D { .bdrv_reopen_commit =3D iscsi_reopen_commit, .bdrv_co_invalidate_cache =3D iscsi_co_invalidate_cache, =20 - .bdrv_getlength =3D iscsi_getlength, - .bdrv_get_info =3D iscsi_get_info, + .bdrv_co_getlength =3D iscsi_getlength, + .bdrv_co_get_info =3D iscsi_get_info, .bdrv_co_truncate =3D iscsi_co_truncate, .bdrv_refresh_limits =3D iscsi_refresh_limits, =20 diff --git a/block/nbd.c b/block/nbd.c index 7d485c86d2..27919d5058 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2124,7 +2124,7 @@ static BlockDriver bdrv_nbd =3D { .bdrv_co_pdiscard =3D nbd_client_co_pdiscard, .bdrv_refresh_limits =3D nbd_refresh_limits, .bdrv_co_truncate =3D nbd_co_truncate, - .bdrv_getlength =3D nbd_getlength, + .bdrv_co_getlength =3D nbd_getlength, .bdrv_refresh_filename =3D nbd_refresh_filename, .bdrv_co_block_status =3D nbd_client_co_block_status, .bdrv_dirname =3D nbd_dirname, @@ -2152,7 +2152,7 @@ static BlockDriver bdrv_nbd_tcp =3D { .bdrv_co_pdiscard =3D nbd_client_co_pdiscard, .bdrv_refresh_limits =3D nbd_refresh_limits, .bdrv_co_truncate =3D nbd_co_truncate, - .bdrv_getlength =3D nbd_getlength, + .bdrv_co_getlength =3D nbd_getlength, .bdrv_refresh_filename =3D nbd_refresh_filename, .bdrv_co_block_status =3D nbd_client_co_block_status, .bdrv_dirname =3D nbd_dirname, @@ -2180,7 +2180,7 @@ static BlockDriver bdrv_nbd_unix =3D { .bdrv_co_pdiscard =3D nbd_client_co_pdiscard, .bdrv_refresh_limits =3D nbd_refresh_limits, .bdrv_co_truncate =3D nbd_co_truncate, - .bdrv_getlength =3D nbd_getlength, + .bdrv_co_getlength =3D nbd_getlength, .bdrv_refresh_filename =3D nbd_refresh_filename, .bdrv_co_block_status =3D nbd_client_co_block_status, .bdrv_dirname =3D nbd_dirname, diff --git a/block/nfs.c b/block/nfs.c index ece22353ac..ea198834f8 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -884,7 +884,7 @@ static BlockDriver bdrv_nfs =3D { .bdrv_has_zero_init =3D nfs_has_zero_init, /* libnfs does not provide the allocated filesize of a file on win32. */ #if !defined(_WIN32) - .bdrv_get_allocated_file_size =3D nfs_get_allocated_file_size, + .bdrv_co_get_allocated_file_size =3D nfs_get_allocated_file_size, #endif .bdrv_co_truncate =3D nfs_file_co_truncate, =20 diff --git a/block/null.c b/block/null.c index 75f7d0db40..f0e29d4f21 100644 --- a/block/null.c +++ b/block/null.c @@ -283,8 +283,8 @@ static BlockDriver bdrv_null_co =3D { =20 .bdrv_file_open =3D null_file_open, .bdrv_parse_filename =3D null_co_parse_filename, - .bdrv_getlength =3D null_getlength, - .bdrv_get_allocated_file_size =3D null_allocated_file_size, + .bdrv_co_getlength =3D null_getlength, + .bdrv_co_get_allocated_file_size =3D null_allocated_file_size, =20 .bdrv_co_preadv =3D null_co_preadv, .bdrv_co_pwritev =3D null_co_pwritev, @@ -304,8 +304,8 @@ static BlockDriver bdrv_null_aio =3D { =20 .bdrv_file_open =3D null_file_open, .bdrv_parse_filename =3D null_aio_parse_filename, - .bdrv_getlength =3D null_getlength, - .bdrv_get_allocated_file_size =3D null_allocated_file_size, + .bdrv_co_getlength =3D null_getlength, + .bdrv_co_get_allocated_file_size =3D null_allocated_file_size, =20 .bdrv_aio_preadv =3D null_aio_preadv, .bdrv_aio_pwritev =3D null_aio_pwritev, diff --git a/block/nvme.c b/block/nvme.c index 656624c585..be9a6801f1 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1642,7 +1642,7 @@ static BlockDriver bdrv_nvme =3D { .bdrv_parse_filename =3D nvme_parse_filename, .bdrv_file_open =3D nvme_file_open, .bdrv_close =3D nvme_close, - .bdrv_getlength =3D nvme_getlength, + .bdrv_co_getlength =3D nvme_getlength, .bdrv_probe_blocksizes =3D nvme_probe_blocksizes, .bdrv_co_truncate =3D nvme_co_truncate, =20 @@ -1663,8 +1663,8 @@ static BlockDriver bdrv_nvme =3D { .bdrv_detach_aio_context =3D nvme_detach_aio_context, .bdrv_attach_aio_context =3D nvme_attach_aio_context, =20 - .bdrv_io_plug =3D nvme_aio_plug, - .bdrv_io_unplug =3D nvme_aio_unplug, + .bdrv_co_io_plug =3D nvme_aio_plug, + .bdrv_co_io_unplug =3D nvme_aio_unplug, =20 .bdrv_register_buf =3D nvme_register_buf, .bdrv_unregister_buf =3D nvme_unregister_buf, diff --git a/block/preallocate.c b/block/preallocate.c index d50ee7f49b..584a8b5912 100644 --- a/block/preallocate.c +++ b/block/preallocate.c @@ -536,7 +536,7 @@ BlockDriver bdrv_preallocate_filter =3D { .format_name =3D "preallocate", .instance_size =3D sizeof(BDRVPreallocateState), =20 - .bdrv_getlength =3D preallocate_getlength, + .bdrv_co_getlength =3D preallocate_getlength, .bdrv_open =3D preallocate_open, .bdrv_close =3D preallocate_close, =20 diff --git a/block/qcow.c b/block/qcow.c index 18e17a5b12..40502eb88c 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -1198,7 +1198,7 @@ static BlockDriver bdrv_qcow =3D { =20 .bdrv_make_empty =3D qcow_make_empty, .bdrv_co_pwritev_compressed =3D qcow_co_pwritev_compressed, - .bdrv_get_info =3D qcow_get_info, + .bdrv_co_get_info =3D qcow_get_info, =20 .create_opts =3D &qcow_create_opts, .strong_runtime_opts =3D qcow_strong_runtime_opts, diff --git a/block/qcow2.c b/block/qcow2.c index 7cc49a3a6c..c42b1fcdd6 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -6078,11 +6078,11 @@ BlockDriver bdrv_qcow2 =3D { .bdrv_snapshot_list =3D qcow2_snapshot_list, .bdrv_snapshot_load_tmp =3D qcow2_snapshot_load_tmp, .bdrv_measure =3D qcow2_measure, - .bdrv_get_info =3D qcow2_get_info, + .bdrv_co_get_info =3D qcow2_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_save_vmstate, + .bdrv_co_load_vmstate =3D qcow2_load_vmstate, =20 .is_format =3D true, .supports_backing =3D true, diff --git a/block/qed.c b/block/qed.c index 9d54c8eec5..f7f0a6dd03 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1653,8 +1653,8 @@ static BlockDriver bdrv_qed =3D { .bdrv_co_writev =3D bdrv_qed_co_writev, .bdrv_co_pwrite_zeroes =3D bdrv_qed_co_pwrite_zeroes, .bdrv_co_truncate =3D bdrv_qed_co_truncate, - .bdrv_getlength =3D bdrv_qed_getlength, - .bdrv_get_info =3D bdrv_qed_get_info, + .bdrv_co_getlength =3D bdrv_qed_getlength, + .bdrv_co_get_info =3D bdrv_qed_get_info, .bdrv_refresh_limits =3D bdrv_qed_refresh_limits, .bdrv_change_backing_file =3D bdrv_qed_change_backing_file, .bdrv_co_invalidate_cache =3D bdrv_qed_co_invalidate_cache, diff --git a/block/quorum.c b/block/quorum.c index f9e6539ceb..121ecdf228 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1283,7 +1283,7 @@ static BlockDriver bdrv_quorum =3D { =20 .bdrv_co_flush =3D quorum_co_flush, =20 - .bdrv_getlength =3D quorum_getlength, + .bdrv_co_getlength =3D quorum_getlength, =20 .bdrv_co_preadv =3D quorum_co_preadv, .bdrv_co_pwritev =3D quorum_co_pwritev, diff --git a/block/raw-format.c b/block/raw-format.c index adc766bf79..ff71c5ef14 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -621,16 +621,16 @@ BlockDriver bdrv_raw =3D { .bdrv_co_copy_range_from =3D &raw_co_copy_range_from, .bdrv_co_copy_range_to =3D &raw_co_copy_range_to, .bdrv_co_truncate =3D &raw_co_truncate, - .bdrv_getlength =3D &raw_getlength, + .bdrv_co_getlength =3D &raw_getlength, .is_format =3D true, .has_variable_length =3D true, .bdrv_measure =3D &raw_measure, - .bdrv_get_info =3D &raw_get_info, + .bdrv_co_get_info =3D &raw_get_info, .bdrv_refresh_limits =3D &raw_refresh_limits, .bdrv_probe_blocksizes =3D &raw_probe_blocksizes, .bdrv_probe_geometry =3D &raw_probe_geometry, - .bdrv_eject =3D &raw_eject, - .bdrv_lock_medium =3D &raw_lock_medium, + .bdrv_co_eject =3D &raw_eject, + .bdrv_co_lock_medium =3D &raw_lock_medium, .bdrv_co_ioctl =3D &raw_co_ioctl, .create_opts =3D &raw_create_opts, .bdrv_has_zero_init =3D &raw_has_zero_init, diff --git a/block/rbd.c b/block/rbd.c index f826410f40..b424cd7260 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -1655,10 +1655,10 @@ static BlockDriver bdrv_rbd =3D { .bdrv_co_create =3D qemu_rbd_co_create, .bdrv_co_create_opts =3D qemu_rbd_co_create_opts, .bdrv_has_zero_init =3D bdrv_has_zero_init_1, - .bdrv_get_info =3D qemu_rbd_getinfo, + .bdrv_co_get_info =3D qemu_rbd_getinfo, .bdrv_get_specific_info =3D qemu_rbd_get_specific_info, .create_opts =3D &qemu_rbd_create_opts, - .bdrv_getlength =3D qemu_rbd_getlength, + .bdrv_co_getlength =3D qemu_rbd_getlength, .bdrv_co_truncate =3D qemu_rbd_co_truncate, .protocol_name =3D "rbd", =20 diff --git a/block/replication.c b/block/replication.c index c62f48a874..6c577959fb 100644 --- a/block/replication.c +++ b/block/replication.c @@ -758,7 +758,7 @@ static BlockDriver bdrv_replication =3D { .bdrv_close =3D replication_close, .bdrv_child_perm =3D replication_child_perm, =20 - .bdrv_getlength =3D replication_getlength, + .bdrv_co_getlength =3D replication_getlength, .bdrv_co_readv =3D replication_co_readv, .bdrv_co_writev =3D replication_co_writev, =20 diff --git a/block/ssh.c b/block/ssh.c index 04726d4ecb..97d7407ce2 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -1363,7 +1363,7 @@ static BlockDriver bdrv_ssh =3D { .bdrv_has_zero_init =3D ssh_has_zero_init, .bdrv_co_readv =3D ssh_co_readv, .bdrv_co_writev =3D ssh_co_writev, - .bdrv_getlength =3D ssh_getlength, + .bdrv_co_getlength =3D ssh_getlength, .bdrv_co_truncate =3D ssh_co_truncate, .bdrv_co_flush_to_disk =3D ssh_co_flush, .bdrv_refresh_filename =3D ssh_refresh_filename, diff --git a/block/throttle.c b/block/throttle.c index 88851c84f4..5e58c2967d 100644 --- a/block/throttle.c +++ b/block/throttle.c @@ -245,7 +245,7 @@ static BlockDriver bdrv_throttle =3D { =20 .bdrv_child_perm =3D bdrv_default_perms, =20 - .bdrv_getlength =3D throttle_getlength, + .bdrv_co_getlength =3D throttle_getlength, =20 .bdrv_co_preadv =3D throttle_co_preadv, .bdrv_co_pwritev =3D throttle_co_pwritev, diff --git a/block/vdi.c b/block/vdi.c index 479bcfe820..df101e94dd 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -1049,7 +1049,7 @@ static BlockDriver bdrv_vdi =3D { .bdrv_co_pwritev =3D vdi_co_pwritev, #endif =20 - .bdrv_get_info =3D vdi_get_info, + .bdrv_co_get_info =3D vdi_get_info, =20 .is_format =3D true, .create_opts =3D &vdi_create_opts, diff --git a/block/vhdx.c b/block/vhdx.c index 4c929800fe..d8ae91772c 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -2245,7 +2245,7 @@ static BlockDriver bdrv_vhdx =3D { .bdrv_co_writev =3D vhdx_co_writev, .bdrv_co_create =3D vhdx_co_create, .bdrv_co_create_opts =3D vhdx_co_create_opts, - .bdrv_get_info =3D vhdx_get_info, + .bdrv_co_get_info =3D vhdx_get_info, .bdrv_co_check =3D vhdx_co_check, .bdrv_has_zero_init =3D vhdx_has_zero_init, =20 diff --git a/block/vmdk.c b/block/vmdk.c index afd3471915..07630581f0 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -3130,11 +3130,11 @@ static BlockDriver bdrv_vmdk =3D { .bdrv_co_create_opts =3D vmdk_co_create_opts, .bdrv_co_create =3D vmdk_co_create, .bdrv_co_block_status =3D vmdk_co_block_status, - .bdrv_get_allocated_file_size =3D vmdk_get_allocated_file_size, + .bdrv_co_get_allocated_file_size =3D vmdk_get_allocated_file_size, .bdrv_has_zero_init =3D vmdk_has_zero_init, .bdrv_get_specific_info =3D vmdk_get_specific_info, .bdrv_refresh_limits =3D vmdk_refresh_limits, - .bdrv_get_info =3D vmdk_get_info, + .bdrv_co_get_info =3D vmdk_get_info, .bdrv_gather_child_options =3D vmdk_gather_child_options, =20 .is_format =3D true, diff --git a/block/vpc.c b/block/vpc.c index 6ee95dcb96..2d01488798 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -1240,7 +1240,7 @@ static BlockDriver bdrv_vpc =3D { .bdrv_co_pwritev =3D vpc_co_pwritev, .bdrv_co_block_status =3D vpc_co_block_status, =20 - .bdrv_get_info =3D vpc_get_info, + .bdrv_co_get_info =3D vpc_get_info, =20 .is_format =3D true, .create_opts =3D &vpc_create_opts, --=20 2.38.1