From nobody Sat May 18 22:54:16 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=1670851387; cv=none; d=zohomail.com; s=zohoarc; b=GSwa1DnqGy1LUbB+FDQ5Pnkdbwx/nErzEdmn+nu4IVKkXxjJYH6E6me/LVH1TN6ydENBgfJDhy4hmKFpC21vxvQm6O7VbyFaKH85DHQ3mua3q8d7VKzu88LkuYSgt9hRNAnRZCtv6xyRT478UL6N+6wA0gRk6jpaP4ZHbDYlZwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670851387; h=Content-Type: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=3T7NE5ADzP+LXMbObkmVqPbSzEVuJYphIL0eUSwJbzg=; b=m4/ireGgnTfyabY3s8KscCa1AaSjiVWrLDVAEqXTdAZ68TO1EYVSWZJ8SoiFt6YFdpDyCbKm5VONE0qpS048Kp74cMrBAaChmwIMeN6JhSitLDTEj7nsJcTAMi9xcGe4SjFknB9F16dmJWJbxfNeGvYihYrTvzAMgv2bJ98wmkY= 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 1670851387727317.9617167027593; Mon, 12 Dec 2022 05:23:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4igO-0006XH-IW; Mon, 12 Dec 2022 08:17:25 -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 1p4igD-0006UV-T7 for qemu-devel@nongnu.org; Mon, 12 Dec 2022 08:17:16 -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 1p4igB-0004HS-Dw for qemu-devel@nongnu.org; Mon, 12 Dec 2022 08:17:13 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-470-bL307gYJPHKse-Q16VVJaA-1; Mon, 12 Dec 2022 08:17:08 -0500 Received: by mail-wr1-f70.google.com with SMTP id i25-20020adfaad9000000b002426945fa63so2224528wrc.6 for ; Mon, 12 Dec 2022 05:17:08 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id i2-20020a1c5402000000b003c6c182bef9sm11254563wmb.36.2022.12.12.05.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 05:17:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670851029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3T7NE5ADzP+LXMbObkmVqPbSzEVuJYphIL0eUSwJbzg=; b=cF9wbTMgzno/zRPuWVa/M3WrPwKkBQVaBSE0VfLb11J8M3d3+rglsEytqhu6f6Le35JZVa 3VmQpjJUjt2SD2yoGIrvAUqn+2mQtGwNduqNSj2e7A86c6uk90+3/F+jZ1OJGjB1ARLWul szFecngdzEBUUuEo3zI1Xzfp06RaTU8= X-MC-Unique: bL307gYJPHKse-Q16VVJaA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3T7NE5ADzP+LXMbObkmVqPbSzEVuJYphIL0eUSwJbzg=; b=LioAjxwLmSP6OsNrTAGPvYAMCuLAGBjNoZcrcun9UByd0psfn4lAzcDL4DMDan5le7 aM5FltcdVdrwCZ4Uo4Uyy5tMV9JGUr2SKKWnEHJweqpvbBp8ED+5yVXNry977zhdtlGN xggF0T50UEhWj7ZqxOufARhE/6RqRYPX35Vd31xQEEIKpUeDDXGTv2O8MxhVy8ipwiRD ZNLBOXD1QHdgeu73o31x0GIBE1VVDKQbpZU/4B8NKo+SAyXDQZ16qGKjW6xV+8Yj21ee 1LSh+WVZqWNyelLtxoftMYXpDG66EHyRW/5LOC6DZ7/lp8Ot2Z+kTSGwyW9oXLicvAJ0 UP8w== X-Gm-Message-State: ANoB5pnD0TfjXJ5/K1IeRI8QYRhBWrSsBtO6dVNtCjborhc7/xX8Nsdr 9/6XDk1KtNk010RCVItcFOZ1+rCnHf3jU2Uz8c0uacQ5S/p5mcdtKb41HErfTTqgUdlP3X9qebf EH+EVtCvqgvpiazFDsNfOJwCoi9c9tE/ARrP1uH7XPesqJGJtTt79JzjCsRENXhRKcis= X-Received: by 2002:a05:600c:1da2:b0:3cf:5fd2:87a0 with SMTP id p34-20020a05600c1da200b003cf5fd287a0mr11810564wms.40.1670851027034; Mon, 12 Dec 2022 05:17:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5git3X/ODv2ldp0fRwdTl22XV3ys/zQafA0iy02Baklyv00abl9SLv7rBNA/ohM+d62qCB2g== X-Received: by 2002:a05:600c:1da2:b0:3cf:5fd2:87a0 with SMTP id p34-20020a05600c1da200b003cf5fd287a0mr11810541wms.40.1670851026692; Mon, 12 Dec 2022 05:17:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, kwolf@redhat.com Subject: [PATCH 1/3] block: apply assertion more widely Date: Mon, 12 Dec 2022 14:16:58 +0100 Message-Id: <20221212131700.250209-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212131700.250209-1-pbonzini@redhat.com> References: <20221212131700.250209-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.133.124; envelope-from=pbonzini@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: 1670851388928100001 Content-Type: text/plain; charset="utf-8" .bdrv_needs_filename is only set for drivers that also set bdrv_file_open, i.e. protocol drivers. So we can make the assertion always, it will always pass for those drivers that use bdrv_open. Signed-off-by: Paolo Bonzini --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 676bbe0529b0..0a625a489a6e 100644 --- a/block.c +++ b/block.c @@ -1617,8 +1617,8 @@ static int bdrv_open_driver(BlockDriverState *bs, Blo= ckDriver *drv, bs->drv =3D drv; bs->opaque =3D g_malloc0(drv->instance_size); =20 + assert(!drv->bdrv_needs_filename || bs->filename[0]); if (drv->bdrv_file_open) { - assert(!drv->bdrv_needs_filename || bs->filename[0]); ret =3D drv->bdrv_file_open(bs, options, open_flags, &local_err); } else if (drv->bdrv_open) { ret =3D drv->bdrv_open(bs, options, open_flags, &local_err); --=20 2.38.1 From nobody Sat May 18 22:54:16 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=1670851499; cv=none; d=zohomail.com; s=zohoarc; b=WAouR1FMO1G8Ajc6vttf9EtQGR3mZ0sJy+fo5z5Y+mp7MfmiOyHmKaDKhjsbUMYxSYniI2FtyaaGz0gXEdtc+wHfFOppIx2mdus0fPXLlYk+etDKi34ZJANLLVCl9PJmt59Xpdhf5j/LCRSV7fl0jlekgxPla3gOWtzXFXji6Qc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670851499; h=Content-Type: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=7PMtV9Oq/t1AGwdxav7mTExmZOl76s9wyB7A+fwPf24=; b=E+zUzdL+pf4E6ix3Z1Lmxw3dP8S5AZ0nmtvE3Rt2bb8GJjw4pKiB/aHSIMn5ZkgtiMpuNmpoR2QzM8B22n329BGjzhF5DmlwfrzoE9ki8FUwbz//EjBgzqPNgAwfjcdIhx43SwkrAUAHv5qE2LrkryBmtcsJDs+p9FjSjZCu9/U= 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 1670851499119563.6066828800217; Mon, 12 Dec 2022 05:24:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4igh-0006fW-8G; Mon, 12 Dec 2022 08:17:43 -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 1p4igJ-0006Uq-2X for qemu-devel@nongnu.org; Mon, 12 Dec 2022 08:17:20 -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 1p4igF-0004IH-Uc for qemu-devel@nongnu.org; Mon, 12 Dec 2022 08:17:17 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-647-LvxElQV-NvKZVMOK78y-0Q-1; Mon, 12 Dec 2022 08:17:11 -0500 Received: by mail-wm1-f72.google.com with SMTP id c187-20020a1c35c4000000b003cfee3c91cdso3345960wma.6 for ; Mon, 12 Dec 2022 05:17:11 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id g20-20020a05600c4ed400b003c71358a42dsm12348484wmq.18.2022.12.12.05.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 05:17:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670851035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7PMtV9Oq/t1AGwdxav7mTExmZOl76s9wyB7A+fwPf24=; b=BPNtSDXuYLB7oQW4ZgmXj9YA0oUqDojY0CWefUHjWAvo/h25UjyOA3mSZJcrPZxqqL4dDJ 9HRmOqwxRyS6qKlM6EytqldINVOAmGKCONhlLWYpvhlkuXdZXGphSF6sSkkVCP2z/A0gj6 /VouLgNRLA5qnZ2jyDJqt/wtjfHnBFY= X-MC-Unique: LvxElQV-NvKZVMOK78y-0Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7PMtV9Oq/t1AGwdxav7mTExmZOl76s9wyB7A+fwPf24=; b=VqPV4KU3ssZZ87PP1q7cetm9/rDYZUYWrPJK1xvZtwzNAfaJRwdUbdIvBwz35YU0I1 Nmk32n/ZEcIo5lfCrJa4zKLRhkp4N0m14vkHvmQgvpSA1IfqWpFLUPJlmkIwM1Ygu4Hc y/GEC8FhFjg2eoSOtqUA3XOKpO7vVJgITOc3JTe9H3urcddMXXsWhTY2Bs6W3mpMWWtZ DN2GHMco4B9PUmzmP/B/RfbQjuaQjKjf0NJXECl9y4/dH3smSq0DYCkie5MHTG12T8ek fff9I+lsGiuuliQrrgAxAKs/nd/KcL9KqjKlOZ/+7Ci88aIljOj84gdAPjMNJ3+Dk/vN twsw== X-Gm-Message-State: ANoB5plIcpAVHwWCL6IESU8V3LxKFrWVQgbkk34ryXfsVSo7XmUkSnkZ a9rqFfr/a38AS4g8reroVt00TTzB9GNnrx3suBEndjI5d+QNwx8vtyGS1TqOfsO59ulSRyF5Dwi mNqxwFm4QAeQ0e7NTVyg/dGmDsI6oDt5VqkQCbVycv2/4EVRHS65OluCGGSCEW55c+e8= X-Received: by 2002:a1c:4b0d:0:b0:3c6:e60f:3f63 with SMTP id y13-20020a1c4b0d000000b003c6e60f3f63mr12699352wma.26.1670851030185; Mon, 12 Dec 2022 05:17:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf59wKrhoRvGmU+v3Z/CD2i0So30Sv7wqxJ8tg7MYqSJxK+ukaSow7eUb2dSqfHK7gsrUSQdxw== X-Received: by 2002:a1c:4b0d:0:b0:3c6:e60f:3f63 with SMTP id y13-20020a1c4b0d000000b003c6e60f3f63mr12699329wma.26.1670851029881; Mon, 12 Dec 2022 05:17:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, kwolf@redhat.com Subject: [PATCH 2/3] block: do not check bdrv_file_open Date: Mon, 12 Dec 2022 14:16:59 +0100 Message-Id: <20221212131700.250209-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212131700.250209-1-pbonzini@redhat.com> References: <20221212131700.250209-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: -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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670851525776100001 Content-Type: text/plain; charset="utf-8" The set of BlockDrivers that have .bdrv_file_open coincides with those that have .protocol_name and guess what---checking drv->bdrv_file_open is done to see if the driver is a protocol. So check drv->protocol_name instead. Signed-off-by: Paolo Bonzini --- block.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 0a625a489a6e..7a66cc2ea23a 100644 --- a/block.c +++ b/block.c @@ -911,7 +911,6 @@ BlockDriver *bdrv_find_protocol(const char *filename, int i; =20 GLOBAL_STATE_CODE(); - /* TODO Drivers without bdrv_file_open must be specified explicitly */ =20 /* * XXX(hch): we really should not let host device detection @@ -1618,7 +1617,7 @@ static int bdrv_open_driver(BlockDriverState *bs, Blo= ckDriver *drv, bs->opaque =3D g_malloc0(drv->instance_size); =20 assert(!drv->bdrv_needs_filename || bs->filename[0]); - if (drv->bdrv_file_open) { + if (drv->bdrv_open) { ret =3D drv->bdrv_file_open(bs, options, open_flags, &local_err); } else if (drv->bdrv_open) { ret =3D drv->bdrv_open(bs, options, open_flags, &local_err); @@ -1930,7 +1929,7 @@ static int bdrv_open_common(BlockDriverState *bs, Blo= ckBackend *file, open_flags =3D bdrv_open_flags(bs, bs->open_flags); node_name =3D qemu_opt_get(opts, "node-name"); =20 - assert(!drv->bdrv_file_open || file =3D=3D NULL); + assert(!drv->protocol_name || file =3D=3D NULL); ret =3D bdrv_open_driver(bs, drv, node_name, options, open_flags, errp= ); if (ret < 0) { goto fail_opts; @@ -2030,7 +2029,7 @@ static int bdrv_fill_options(QDict **options, const c= har *filename, } /* If the user has explicitly specified the driver, this choice sh= ould * override the BDRV_O_PROTOCOL flag */ - protocol =3D drv->bdrv_file_open; + protocol =3D drv->protocol_name; } =20 if (protocol) { @@ -3932,7 +3931,7 @@ static BlockDriverState *bdrv_open_inherit(const char= *filename, } =20 /* BDRV_O_PROTOCOL must be set iff a protocol BDS is about to be creat= ed */ - assert(!!(flags & BDRV_O_PROTOCOL) =3D=3D !!drv->bdrv_file_open); + assert(!!(flags & BDRV_O_PROTOCOL) =3D=3D !!drv->protocol_name); /* file must be NULL if a protocol BDS is about to be created * (the inverse results in an error message from bdrv_open_common()) */ assert(!(flags & BDRV_O_PROTOCOL) || !file); @@ -5671,7 +5670,7 @@ int64_t bdrv_get_allocated_file_size(BlockDriverState= *bs) return drv->bdrv_get_allocated_file_size(bs); } =20 - if (drv->bdrv_file_open) { + if (drv->protocol_name) { /* * Protocol drivers default to -ENOTSUP (most of their data is * not stored in any of their children (if they even have any), @@ -7772,7 +7771,7 @@ void bdrv_refresh_filename(BlockDriverState *bs) * Both of these conditions are represented by generate_json_fil= ename. */ if (primary_child_bs->exact_filename[0] && - primary_child_bs->drv->bdrv_file_open && + primary_child_bs->drv->protocol_name && !drv->is_filter && !generate_json_filename) { strcpy(bs->exact_filename, primary_child_bs->exact_filename); --=20 2.38.1 From nobody Sat May 18 22:54:16 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=1670851968; cv=none; d=zohomail.com; s=zohoarc; b=QZXKG+1Y1tQQf9uA6dkfMfwAxG//2NUkiD9WdrD7YznvJfTAEmC3btzVYcpuLTI4SOEODrwGD2al1ZSjMn1wfuWQvEvPm3s+Gv4NY032ikvt9iDWY9NjGUUeiRUKjNY5BNoR8UVteM+DVZI0ST5gTxn2y1O1DHNEs70T2PwCn8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670851968; h=Content-Type: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=5tPF49/UUjVqgitscASI3uSOIKkEYyONSpFX3RhRhfk=; b=lK6iRlf9cuwMReKBNwsPON/M9HFaY/7lBt5CrM5VreAZOHW83dV4pMHRmqtPpU+LuES0CGfAq0ghMj8kYr3Kmgdf3NXJcXTEb0MTBnkdGdBjD6NGXaT+NE8LusAEATo/CrOl0mh75kNy0o+O5J29UGXce+m9Yp/1jm/CMbAdsRs= 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 1670851968225621.0610232472598; Mon, 12 Dec 2022 05:32:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4igj-0006hP-2J; Mon, 12 Dec 2022 08:17:45 -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 1p4igJ-0006Up-29 for qemu-devel@nongnu.org; Mon, 12 Dec 2022 08:17:20 -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 1p4igG-0004IL-CW for qemu-devel@nongnu.org; Mon, 12 Dec 2022 08:17:18 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-461-_bz4HNIOMH2fJ7975Nb-CQ-1; Mon, 12 Dec 2022 08:17:14 -0500 Received: by mail-wr1-f72.google.com with SMTP id g14-20020adfa48e000000b00241f94bcd54so2246379wrb.23 for ; Mon, 12 Dec 2022 05:17:14 -0800 (PST) Received: from avogadro.local ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id m5-20020adffe45000000b002302dc43d77sm8793436wrs.115.2022.12.12.05.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 05:17:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670851035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5tPF49/UUjVqgitscASI3uSOIKkEYyONSpFX3RhRhfk=; b=V/rPpvgmjBR/HsGdrDIejTFpsQxrKRiXW9WQpa7mdzojkW+ytLrN5Hc2Xjj/XjdNQRSqnO wCrrLDx8EHqgoFp1mfKqt36h4ywT4uKusuqlLzK6X6C6HNkzaeKbtWIFR/E+LqNvJhpzK3 kUkjCRQF8wAVkpDGa/jj57/KWOmIeRk= X-MC-Unique: _bz4HNIOMH2fJ7975Nb-CQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5tPF49/UUjVqgitscASI3uSOIKkEYyONSpFX3RhRhfk=; b=aOtpVCne7SsVGJ/3o5SPCA6jxGc5d40uMEYgBa9tGNwUz9puKYN0zA6PnNgk4LzIr5 ak5QUDtJF9pK7Jjse2NYcWe1e3NQB8aYd8cA0KiMmQgyr+MYQfpO6jZbXjzs7sj/nxpy O5nsgjGmuCVAGz0RYsXn/Zz2MLbZvUk3z28zt7Vb5TMvw5wRbyHqBDNseEhiLZmTzGqK Qc46PV2RAvLUBbJULx5X6rcnKiOu87cDrIdlTG2oBokf9IGwA3vQ/pF3/MuooDeqpb6U 0zr+9GU4TeLDz2l0/YvOhk/YN9e3uQkdgxEa8LpKSF5ozdhP4BY2rR4KE4kVUI34CbhS xJoA== X-Gm-Message-State: ANoB5pmgJHQYSpV2ei/SBLo+SIA3y09DaETFXXRVfUHP9m4T6vK87mXD fTQKKHS/txg1E5wJbjej2t2DvLr1x3oy3xf/97yOM2QrjysnyQH2qvFlcRb7h9jUhRTIFwlnJhN YOd+oDGAj8fo44wRmg+0JkS0G464QIjaxRa8AR790yRL59x9rL1EUMJjtjNiF2DNwkik= X-Received: by 2002:adf:e811:0:b0:242:5083:abeb with SMTP id o17-20020adfe811000000b002425083abebmr10870081wrm.1.1670851032877; Mon, 12 Dec 2022 05:17:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf6QDlP+RrauD8EfPopxo+a9iNcwrlv3CezK15WT7tsKKhQfbTlInBz0+Brl6e9c2YHWUsBJiQ== X-Received: by 2002:adf:e811:0:b0:242:5083:abeb with SMTP id o17-20020adfe811000000b002425083abebmr10870060wrm.1.1670851032533; Mon, 12 Dec 2022 05:17:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, kwolf@redhat.com Subject: [PATCH 3/3] block: remove separate bdrv_file_open callback Date: Mon, 12 Dec 2022 14:17:00 +0100 Message-Id: <20221212131700.250209-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221212131700.250209-1-pbonzini@redhat.com> References: <20221212131700.250209-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: -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: 1670851968770100001 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 callback. Signed-off-by: Paolo Bonzini --- block.c | 2 -- 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 | 8 ++++---- 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 +- include/block/block_int-common.h | 3 --- 17 files changed, 30 insertions(+), 34 deletions(-) diff --git a/block.c b/block.c index 7a66cc2ea23a..48efbf94106e 100644 --- a/block.c +++ b/block.c @@ -1618,8 +1618,6 @@ static int bdrv_open_driver(BlockDriverState *bs, Blo= ckDriver *drv, =20 assert(!drv->bdrv_needs_filename || bs->filename[0]); if (drv->bdrv_open) { - ret =3D drv->bdrv_file_open(bs, options, open_flags, &local_err); - } else 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 4265ca125e25..a4445a352876 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -1071,7 +1071,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 5eae3adfaf66..45ae5780152c 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -994,7 +994,7 @@ static void blkio_refresh_limits(BlockDriverState *bs, = Error **errp) .format_name =3D name, \ .protocol_name =3D name, \ .instance_size =3D sizeof(BDRVBlkioState), \ - .bdrv_file_open =3D blkio_file_open, \ + .bdrv_open =3D blkio_open, \ .bdrv_close =3D blkio_close, \ .bdrv_getlength =3D blkio_getlength, \ .bdrv_co_truncate =3D blkio_truncate, \ diff --git a/block/blkverify.c b/block/blkverify.c index c60a2dc624dc..e5b5d5c4a426 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -310,7 +310,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_getlength =3D blkverify_getlength, diff --git a/block/curl.c b/block/curl.c index cba4c4cac768..398b28163e00 100644 --- a/block/curl.c +++ b/block/curl.c @@ -999,7 +999,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_getlength =3D curl_getlength, =20 @@ -1018,7 +1018,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_getlength =3D curl_getlength, =20 @@ -1037,7 +1037,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_getlength =3D curl_getlength, =20 @@ -1056,7 +1056,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_getlength =3D curl_getlength, =20 diff --git a/block/file-posix.c b/block/file-posix.c index b9647c5ffc26..91c4a2d74687 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3301,7 +3301,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, @@ -3675,7 +3675,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, @@ -3803,7 +3803,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, @@ -3934,7 +3934,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 ec9d64d0e4e2..4207e521f22a 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -748,7 +748,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, @@ -921,7 +921,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 7c90f7ba4b80..0ab196b35229 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -1554,7 +1554,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, @@ -1583,7 +1583,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, @@ -1612,7 +1612,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, @@ -1647,7 +1647,7 @@ static BlockDriver bdrv_gluster_rdma =3D { .format_name =3D "gluster", .protocol_name =3D "gluster+rdma", .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 a316d46d9625..dc6cbe0f74a5 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2425,7 +2425,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, @@ -2464,7 +2464,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 7d485c86d285..a332372a5380 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2114,7 +2114,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, @@ -2142,7 +2142,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, @@ -2170,7 +2170,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 ece22353ac53..126e3898f966 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 75f7d0db40c4..f3a427b6c69a 100644 --- a/block/null.c +++ b/block/null.c @@ -281,7 +281,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_getlength =3D null_getlength, .bdrv_get_allocated_file_size =3D null_allocated_file_size, @@ -302,7 +302,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_getlength =3D null_getlength, .bdrv_get_allocated_file_size =3D null_allocated_file_size, diff --git a/block/nvme.c b/block/nvme.c index 656624c585a2..5083b36b89bc 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1640,7 +1640,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_getlength =3D nvme_getlength, .bdrv_probe_blocksizes =3D nvme_probe_blocksizes, diff --git a/block/rbd.c b/block/rbd.c index f826410f40f9..4c759dd51167 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -1648,8 +1648,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 04726d4ecb58..07a99d6b8ed6 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -1356,7 +1356,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 723c91216e0c..88943a99db9d 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -3257,7 +3257,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, diff --git a/include/block/block_int-common.h b/include/block/block_int-com= mon.h index a6bc6b7fe9bd..c670f3c8da1c 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -245,9 +245,6 @@ struct BlockDriver { int (*bdrv_open)(BlockDriverState *bs, QDict *options, int flags, Error **errp); =20 - /* Protocol drivers should implement this instead of bdrv_open */ - int (*bdrv_file_open)(BlockDriverState *bs, QDict *options, int flags, - Error **errp); void (*bdrv_close)(BlockDriverState *bs); =20 int coroutine_fn (*bdrv_co_create)(BlockdevCreateOptions *opts, --=20 2.38.1