From nobody Mon Nov 25 02:44:02 2024 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=1719037057; cv=none; d=zohomail.com; s=zohoarc; b=lfDYLcpfX6i0i9Wi/XF6hC+BRczONjGp6QNtj4nPYjEsAPIRtXe/0O1ujWh7Ke1XLFUUhhzBlU2TFI2pPLaqveM7kDWmgk+dS/wrKZamwXXhqWTLtdqEnlAp5NQkfp73pca1UD9iUPXu79ifu39wNz0ycQ9wIuZw2xUXWBKd2tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719037057; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=26VrXM0DHOiKV7RbRMquU6833DYubbhko1Fn4Gg+sYw=; b=M7KpH00ISN3IIKWmfUYOYjuLIW7O31drKx8AXmRZvzAqHFlFTQrHBUWefTkpdpZ/4RbqRNVjh2M8JNMPKHuOY9N0Nso6yTJ2M6S33b4o0rZvVd+K9RwwBdroiIo0GQ2f/hoqpl3T7spA+ePck+i44/t88TAErDHwqsTu1F6v5Y8= 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 1719037057840104.63982927608038; Fri, 21 Jun 2024 23:17:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKu42-0001Y4-Bu; Sat, 22 Jun 2024 02:17:30 -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 1sKu3T-0000W2-Qr for qemu-devel@nongnu.org; Sat, 22 Jun 2024 02:16:56 -0400 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 1sKu3R-0006V2-KZ for qemu-devel@nongnu.org; Sat, 22 Jun 2024 02:16:55 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-1UoEU_9bNGSDzM8OlXTHCQ-1; Sat, 22 Jun 2024 02:16:49 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a6def6e9ef2so317182966b.0 for ; Fri, 21 Jun 2024 23:16:49 -0700 (PDT) Received: from avogadro.local ([151.62.196.71]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6fcf48b3bdsm155828766b.75.2024.06.21.23.16.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 23:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719037013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=26VrXM0DHOiKV7RbRMquU6833DYubbhko1Fn4Gg+sYw=; b=IVFTMP4xR4mquExcCglN6GjMOIAhoR7R9I6scCBR+wdX5+HEEjwwpI69/APUumd3Q0VzAO xpVGgejbvWuk8cVhh8N+99q1K1eQwJ9EkMxVmmrOoQNbHgXYsgdf3HOCPS7D5uSFgAmA/h YIEQlhPmiw4QIx59vmD/yiYDMX9PY5w= X-MC-Unique: 1UoEU_9bNGSDzM8OlXTHCQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719037007; x=1719641807; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=26VrXM0DHOiKV7RbRMquU6833DYubbhko1Fn4Gg+sYw=; b=jPeTLNtp4c9xcVsFpx2kgafjWvH9SVXSW8S/nLgvXjGi09Eikt7VjVi3M1ShG47jks akxYQBgC7c4z7MzY7QSOmeJ/4jzq+r0FaeWobWqY07/DIQjsng8uqSuihESU8AloZegP RhQ9kKf7oEdjEcIG28xkRB5wb6Sf028/8KceKilhBEeL8c9Zc0uNfM84LtsNSY/rlGZy V5JC9yHonE9wQRhxiTHe8IpTXHcY+igygpXuQJeSRWVp8dokc1fVEifn1id3Ecfb3WPj YJTwwlpwZZf02MOJqnhZJhC9s6u3p5e0wnI6eRSq5TeuH6LrUVPA2MuL8xOOrKJUTNjz P8cw== X-Gm-Message-State: AOJu0YzVVFnsT1HwAIjdfsbYWkSDp5MTL02AxcxuOLQCJlYYgrcv6KbV geDEUWOsXHnGxXoTkz+Xp+uAXoNduKEgUVRwGNwBCHNeKVFxb1uIQcFaks8QDF+iiVpk0t5VYdB NGJPN669ANfmo/C3d43Ai0uqKDv/2jP/q/XIqmPZ6JqWNTNHh89NcqVS+Qz7I41EYRuugbZhNe0 LKcx0Wt/72DZciT4yIU3Khfc1++BJKe0o2a4+g X-Received: by 2002:a17:906:339a:b0:a6f:4287:f196 with SMTP id a640c23a62f3a-a6ffe2706a7mr37261066b.2.1719037007369; Fri, 21 Jun 2024 23:16:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEsBeFiVJUegOJ0SGTHzkx0ENXAcHRZaQWUiP6R4Fa649NiHQtH0QtfMsSpMTGnoOPAale4aA== X-Received: by 2002:a17:906:339a:b0:a6f:4287:f196 with SMTP id a640c23a62f3a-a6ffe2706a7mr37259266b.2.1719037006749; Fri, 21 Jun 2024 23:16:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/23] block: remove separate bdrv_file_open callback Date: Sat, 22 Jun 2024 08:15:54 +0200 Message-ID: <20240622061558.530543-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622061558.530543-1-pbonzini@redhat.com> References: <20240622061558.530543-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.145, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: 1719037059406100013 Content-Type: text/plain; charset="utf-8" bdrv_file_open and bdrv_open are completely equivalent, they are never checked except to see which one to invoke. So merge them into a single one. Signed-off-by: Paolo Bonzini --- include/block/block_int-common.h | 3 --- block.c | 4 +--- block/blkdebug.c | 2 +- block/blkio.c | 2 +- block/blkverify.c | 2 +- block/curl.c | 8 ++++---- block/file-posix.c | 8 ++++---- block/file-win32.c | 4 ++-- block/gluster.c | 6 +++--- block/iscsi.c | 4 ++-- block/nbd.c | 6 +++--- block/nfs.c | 2 +- block/null.c | 4 ++-- block/nvme.c | 2 +- block/rbd.c | 3 ++- block/ssh.c | 2 +- block/vvfat.c | 2 +- 17 files changed, 30 insertions(+), 34 deletions(-) diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index 761276127ed..ebb4e56a503 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -248,9 +248,6 @@ struct BlockDriver { int GRAPH_UNLOCKED_PTR (*bdrv_open)( BlockDriverState *bs, QDict *options, int flags, Error **errp); =20 - /* Protocol drivers should implement this instead of bdrv_open */ - int GRAPH_UNLOCKED_PTR (*bdrv_file_open)( - BlockDriverState *bs, QDict *options, int flags, Error **errp); void (*bdrv_close)(BlockDriverState *bs); =20 int coroutine_fn GRAPH_UNLOCKED_PTR (*bdrv_co_create)( diff --git a/block.c b/block.c index dd14ba85fc3..c1cc313d216 100644 --- a/block.c +++ b/block.c @@ -1655,9 +1655,7 @@ bdrv_open_driver(BlockDriverState *bs, BlockDriver *d= rv, const char *node_name, bs->opaque =3D g_malloc0(drv->instance_size); =20 assert(!drv->bdrv_needs_filename || bs->filename[0]); - if (drv->bdrv_file_open) { - ret =3D drv->bdrv_file_open(bs, options, open_flags, &local_err); - } else if (drv->bdrv_open) { + if (drv->bdrv_open) { ret =3D drv->bdrv_open(bs, options, open_flags, &local_err); } else { ret =3D 0; diff --git a/block/blkdebug.c b/block/blkdebug.c index 9da8c9eddc2..c95c818c388 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -1073,7 +1073,7 @@ static BlockDriver bdrv_blkdebug =3D { .is_filter =3D true, =20 .bdrv_parse_filename =3D blkdebug_parse_filename, - .bdrv_file_open =3D blkdebug_open, + .bdrv_open =3D blkdebug_open, .bdrv_close =3D blkdebug_close, .bdrv_reopen_prepare =3D blkdebug_reopen_prepare, .bdrv_child_perm =3D blkdebug_child_perm, diff --git a/block/blkio.c b/block/blkio.c index 882e1c297b4..1a38064ce76 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -1088,7 +1088,7 @@ static void blkio_refresh_limits(BlockDriverState *bs= , Error **errp) */ #define BLKIO_DRIVER_COMMON \ .instance_size =3D sizeof(BDRVBlkioState), \ - .bdrv_file_open =3D blkio_file_open, \ + .bdrv_open =3D blkio_file_open, \ .bdrv_close =3D blkio_close, \ .bdrv_co_getlength =3D blkio_co_getlength, \ .bdrv_co_truncate =3D blkio_truncate, \ diff --git a/block/blkverify.c b/block/blkverify.c index ec45d8335ed..5a9bf674d9c 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -321,7 +321,7 @@ static BlockDriver bdrv_blkverify =3D { .instance_size =3D sizeof(BDRVBlkverifyState), =20 .bdrv_parse_filename =3D blkverify_parse_filename, - .bdrv_file_open =3D blkverify_open, + .bdrv_open =3D blkverify_open, .bdrv_close =3D blkverify_close, .bdrv_child_perm =3D bdrv_default_perms, .bdrv_co_getlength =3D blkverify_co_getlength, diff --git a/block/curl.c b/block/curl.c index 419f7c89ef2..ef5252d00b5 100644 --- a/block/curl.c +++ b/block/curl.c @@ -1034,7 +1034,7 @@ static BlockDriver bdrv_http =3D { =20 .instance_size =3D sizeof(BDRVCURLState), .bdrv_parse_filename =3D curl_parse_filename, - .bdrv_file_open =3D curl_open, + .bdrv_open =3D curl_open, .bdrv_close =3D curl_close, .bdrv_co_getlength =3D curl_co_getlength, =20 @@ -1053,7 +1053,7 @@ static BlockDriver bdrv_https =3D { =20 .instance_size =3D sizeof(BDRVCURLState), .bdrv_parse_filename =3D curl_parse_filename, - .bdrv_file_open =3D curl_open, + .bdrv_open =3D curl_open, .bdrv_close =3D curl_close, .bdrv_co_getlength =3D curl_co_getlength, =20 @@ -1072,7 +1072,7 @@ static BlockDriver bdrv_ftp =3D { =20 .instance_size =3D sizeof(BDRVCURLState), .bdrv_parse_filename =3D curl_parse_filename, - .bdrv_file_open =3D curl_open, + .bdrv_open =3D curl_open, .bdrv_close =3D curl_close, .bdrv_co_getlength =3D curl_co_getlength, =20 @@ -1091,7 +1091,7 @@ static BlockDriver bdrv_ftps =3D { =20 .instance_size =3D sizeof(BDRVCURLState), .bdrv_parse_filename =3D curl_parse_filename, - .bdrv_file_open =3D curl_open, + .bdrv_open =3D curl_open, .bdrv_close =3D curl_close, .bdrv_co_getlength =3D curl_co_getlength, =20 diff --git a/block/file-posix.c b/block/file-posix.c index be25e35ff6e..f3bd946afac 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3886,7 +3886,7 @@ BlockDriver bdrv_file =3D { .bdrv_needs_filename =3D true, .bdrv_probe =3D NULL, /* no probe for protocols */ .bdrv_parse_filename =3D raw_parse_filename, - .bdrv_file_open =3D raw_open, + .bdrv_open =3D raw_open, .bdrv_reopen_prepare =3D raw_reopen_prepare, .bdrv_reopen_commit =3D raw_reopen_commit, .bdrv_reopen_abort =3D raw_reopen_abort, @@ -4257,7 +4257,7 @@ static BlockDriver bdrv_host_device =3D { .bdrv_needs_filename =3D true, .bdrv_probe_device =3D hdev_probe_device, .bdrv_parse_filename =3D hdev_parse_filename, - .bdrv_file_open =3D hdev_open, + .bdrv_open =3D hdev_open, .bdrv_close =3D raw_close, .bdrv_reopen_prepare =3D raw_reopen_prepare, .bdrv_reopen_commit =3D raw_reopen_commit, @@ -4396,7 +4396,7 @@ static BlockDriver bdrv_host_cdrom =3D { .bdrv_needs_filename =3D true, .bdrv_probe_device =3D cdrom_probe_device, .bdrv_parse_filename =3D cdrom_parse_filename, - .bdrv_file_open =3D cdrom_open, + .bdrv_open =3D cdrom_open, .bdrv_close =3D raw_close, .bdrv_reopen_prepare =3D raw_reopen_prepare, .bdrv_reopen_commit =3D raw_reopen_commit, @@ -4522,7 +4522,7 @@ static BlockDriver bdrv_host_cdrom =3D { .bdrv_needs_filename =3D true, .bdrv_probe_device =3D cdrom_probe_device, .bdrv_parse_filename =3D cdrom_parse_filename, - .bdrv_file_open =3D cdrom_open, + .bdrv_open =3D cdrom_open, .bdrv_close =3D raw_close, .bdrv_reopen_prepare =3D raw_reopen_prepare, .bdrv_reopen_commit =3D raw_reopen_commit, diff --git a/block/file-win32.c b/block/file-win32.c index 48b790d9173..7e1baa1ece6 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -746,7 +746,7 @@ BlockDriver bdrv_file =3D { .instance_size =3D sizeof(BDRVRawState), .bdrv_needs_filename =3D true, .bdrv_parse_filename =3D raw_parse_filename, - .bdrv_file_open =3D raw_open, + .bdrv_open =3D raw_open, .bdrv_refresh_limits =3D raw_probe_alignment, .bdrv_close =3D raw_close, .bdrv_co_create_opts =3D raw_co_create_opts, @@ -920,7 +920,7 @@ static BlockDriver bdrv_host_device =3D { .bdrv_needs_filename =3D true, .bdrv_parse_filename =3D hdev_parse_filename, .bdrv_probe_device =3D hdev_probe_device, - .bdrv_file_open =3D hdev_open, + .bdrv_open =3D hdev_open, .bdrv_close =3D raw_close, .bdrv_refresh_limits =3D hdev_refresh_limits, =20 diff --git a/block/gluster.c b/block/gluster.c index d0999903dfe..f8b415f3812 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -1551,7 +1551,7 @@ static BlockDriver bdrv_gluster =3D { .format_name =3D "gluster", .protocol_name =3D "gluster", .instance_size =3D sizeof(BDRVGlusterState), - .bdrv_file_open =3D qemu_gluster_open, + .bdrv_open =3D qemu_gluster_open, .bdrv_reopen_prepare =3D qemu_gluster_reopen_prepare, .bdrv_reopen_commit =3D qemu_gluster_reopen_commit, .bdrv_reopen_abort =3D qemu_gluster_reopen_abort, @@ -1580,7 +1580,7 @@ static BlockDriver bdrv_gluster_tcp =3D { .format_name =3D "gluster", .protocol_name =3D "gluster+tcp", .instance_size =3D sizeof(BDRVGlusterState), - .bdrv_file_open =3D qemu_gluster_open, + .bdrv_open =3D qemu_gluster_open, .bdrv_reopen_prepare =3D qemu_gluster_reopen_prepare, .bdrv_reopen_commit =3D qemu_gluster_reopen_commit, .bdrv_reopen_abort =3D qemu_gluster_reopen_abort, @@ -1609,7 +1609,7 @@ static BlockDriver bdrv_gluster_unix =3D { .format_name =3D "gluster", .protocol_name =3D "gluster+unix", .instance_size =3D sizeof(BDRVGlusterState), - .bdrv_file_open =3D qemu_gluster_open, + .bdrv_open =3D qemu_gluster_open, .bdrv_reopen_prepare =3D qemu_gluster_reopen_prepare, .bdrv_reopen_commit =3D qemu_gluster_reopen_commit, .bdrv_reopen_abort =3D qemu_gluster_reopen_abort, diff --git a/block/iscsi.c b/block/iscsi.c index 2ff14b74724..979bf90cb79 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2429,7 +2429,7 @@ static BlockDriver bdrv_iscsi =3D { =20 .instance_size =3D sizeof(IscsiLun), .bdrv_parse_filename =3D iscsi_parse_filename, - .bdrv_file_open =3D iscsi_open, + .bdrv_open =3D iscsi_open, .bdrv_close =3D iscsi_close, .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, .create_opts =3D &bdrv_create_opts_simple, @@ -2468,7 +2468,7 @@ static BlockDriver bdrv_iser =3D { =20 .instance_size =3D sizeof(IscsiLun), .bdrv_parse_filename =3D iscsi_parse_filename, - .bdrv_file_open =3D iscsi_open, + .bdrv_open =3D iscsi_open, .bdrv_close =3D iscsi_close, .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, .create_opts =3D &bdrv_create_opts_simple, diff --git a/block/nbd.c b/block/nbd.c index 589d28af833..d464315766e 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2146,7 +2146,7 @@ static BlockDriver bdrv_nbd =3D { .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, .create_opts =3D &bdrv_create_opts_simple, - .bdrv_file_open =3D nbd_open, + .bdrv_open =3D nbd_open, .bdrv_reopen_prepare =3D nbd_client_reopen_prepare, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, @@ -2174,7 +2174,7 @@ static BlockDriver bdrv_nbd_tcp =3D { .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, .create_opts =3D &bdrv_create_opts_simple, - .bdrv_file_open =3D nbd_open, + .bdrv_open =3D nbd_open, .bdrv_reopen_prepare =3D nbd_client_reopen_prepare, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, @@ -2202,7 +2202,7 @@ static BlockDriver bdrv_nbd_unix =3D { .bdrv_parse_filename =3D nbd_parse_filename, .bdrv_co_create_opts =3D bdrv_co_create_opts_simple, .create_opts =3D &bdrv_create_opts_simple, - .bdrv_file_open =3D nbd_open, + .bdrv_open =3D nbd_open, .bdrv_reopen_prepare =3D nbd_client_reopen_prepare, .bdrv_co_preadv =3D nbd_client_co_preadv, .bdrv_co_pwritev =3D nbd_client_co_pwritev, diff --git a/block/nfs.c b/block/nfs.c index 60240a8733d..0500f60c08f 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -888,7 +888,7 @@ static BlockDriver bdrv_nfs =3D { #endif .bdrv_co_truncate =3D nfs_file_co_truncate, =20 - .bdrv_file_open =3D nfs_file_open, + .bdrv_open =3D nfs_file_open, .bdrv_close =3D nfs_file_close, .bdrv_co_create =3D nfs_file_co_create, .bdrv_co_create_opts =3D nfs_file_co_create_opts, diff --git a/block/null.c b/block/null.c index 4808704ffd3..6fa64d20d86 100644 --- a/block/null.c +++ b/block/null.c @@ -283,7 +283,7 @@ static BlockDriver bdrv_null_co =3D { .protocol_name =3D "null-co", .instance_size =3D sizeof(BDRVNullState), =20 - .bdrv_file_open =3D null_file_open, + .bdrv_open =3D null_file_open, .bdrv_parse_filename =3D null_co_parse_filename, .bdrv_co_getlength =3D null_co_getlength, .bdrv_co_get_allocated_file_size =3D null_co_get_allocated_file_size, @@ -304,7 +304,7 @@ static BlockDriver bdrv_null_aio =3D { .protocol_name =3D "null-aio", .instance_size =3D sizeof(BDRVNullState), =20 - .bdrv_file_open =3D null_file_open, + .bdrv_open =3D null_file_open, .bdrv_parse_filename =3D null_aio_parse_filename, .bdrv_co_getlength =3D null_co_getlength, .bdrv_co_get_allocated_file_size =3D null_co_get_allocated_file_size, diff --git a/block/nvme.c b/block/nvme.c index 3a3c6da73d2..c84914af6dd 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1630,7 +1630,7 @@ static BlockDriver bdrv_nvme =3D { .create_opts =3D &bdrv_create_opts_simple, =20 .bdrv_parse_filename =3D nvme_parse_filename, - .bdrv_file_open =3D nvme_file_open, + .bdrv_open =3D nvme_file_open, .bdrv_close =3D nvme_close, .bdrv_co_getlength =3D nvme_co_getlength, .bdrv_probe_blocksizes =3D nvme_probe_blocksizes, diff --git a/block/rbd.c b/block/rbd.c index 84bb2fa5d71..9c0fd0cb3f7 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -1815,8 +1815,9 @@ static const char *const qemu_rbd_strong_runtime_opts= [] =3D { static BlockDriver bdrv_rbd =3D { .format_name =3D "rbd", .instance_size =3D sizeof(BDRVRBDState), + .bdrv_parse_filename =3D qemu_rbd_parse_filename, - .bdrv_file_open =3D qemu_rbd_open, + .bdrv_open =3D qemu_rbd_open, .bdrv_close =3D qemu_rbd_close, .bdrv_reopen_prepare =3D qemu_rbd_reopen_prepare, .bdrv_co_create =3D qemu_rbd_co_create, diff --git a/block/ssh.c b/block/ssh.c index a88171d4b53..1344822ed85 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -1362,7 +1362,7 @@ static BlockDriver bdrv_ssh =3D { .protocol_name =3D "ssh", .instance_size =3D sizeof(BDRVSSHState), .bdrv_parse_filename =3D ssh_parse_filename, - .bdrv_file_open =3D ssh_file_open, + .bdrv_open =3D ssh_file_open, .bdrv_co_create =3D ssh_co_create, .bdrv_co_create_opts =3D ssh_co_create_opts, .bdrv_close =3D ssh_close, diff --git a/block/vvfat.c b/block/vvfat.c index 9d050ba3aea..086fedf4745 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -3258,7 +3258,7 @@ static BlockDriver bdrv_vvfat =3D { .instance_size =3D sizeof(BDRVVVFATState), =20 .bdrv_parse_filename =3D vvfat_parse_filename, - .bdrv_file_open =3D vvfat_open, + .bdrv_open =3D vvfat_open, .bdrv_refresh_limits =3D vvfat_refresh_limits, .bdrv_close =3D vvfat_close, .bdrv_child_perm =3D vvfat_child_perm, --=20 2.45.2