From nobody Thu May 2 08:02:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678351924; cv=none; d=zohomail.com; s=zohoarc; b=LERqW9P6uIwp9CdQWubf6emWZqyStDhBOUPLU6YSMQ9Jsuq8BxePg3IapPKffDXfUS6YwkDoahJ+6gPUsQUQDQMChrULr+/G0+2goPyMEH4bFy0jwQlwmTR7R292g1yk6zMb7lTcRTDZk39qRPDZY87hr2sozCbmFbp+PkgTSLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678351924; 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=3jY37BUfW1TKZ4UmYf+KE+hvIbchKyfg8OkPz1QdnU4=; b=n8HeyYMxskY5Xi3yzYqivue8rlUEBk+g2LFPceMYO4zTumplGGZluRxAP1tnZwztbp7QZGbjWQoOkfnpqHqp4wN4cL1TrdVb+jZlMLxwvz6WgMFYXsAwaK6S0GjJCJdlE3ph3cmMKv58AJ6xlNTx4IUoPh/Grj85bcsVRZ2+S04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678351924848240.5124763554295; Thu, 9 Mar 2023 00:52:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paBzO-0007lE-Sv; Thu, 09 Mar 2023 03:51:06 -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 1paBzH-0007k3-Us for qemu-devel@nongnu.org; Thu, 09 Mar 2023 03:51:04 -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 1paBzG-00021G-4m for qemu-devel@nongnu.org; Thu, 09 Mar 2023 03:50:59 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-jnTncEc6PWmuwoe38rM9Hw-1; Thu, 09 Mar 2023 03:50:56 -0500 Received: by mail-ed1-f72.google.com with SMTP id c1-20020a0564021f8100b004acbe232c03so1893335edc.9 for ; Thu, 09 Mar 2023 00:50:55 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id jy24-20020a170907763800b008d7a8083dffsm8536640ejc.222.2023.03.09.00.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 00:50:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678351857; 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=3jY37BUfW1TKZ4UmYf+KE+hvIbchKyfg8OkPz1QdnU4=; b=BOgH2xBF/zuQ6hqUUAwSzxs0RHCQ26xLiMcan7Xi/gW1uzjcVbodzO8eCxz0KkxX7Ct4pW PuYxLpr1K11lsvg258nrw5h42bQA+AuaGkRyd3tguOdrezw4t9u7h0mkl1VYSdaaI6lTAt zwRV3FFeokK7OrNBe+nzArzICP8QjKs= X-MC-Unique: jnTncEc6PWmuwoe38rM9Hw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678351854; 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=3jY37BUfW1TKZ4UmYf+KE+hvIbchKyfg8OkPz1QdnU4=; b=oLQIqzfJ50C7NGkF9p+lIukh61RMWZXyBuGh6+XSpjaDHWE6UGJ7LbQmXzh9jE2xHC XTCRthUxythNAtk+vQvIa+aph+FLNJ5+m9Mfh1PCekEv83r6ZlAjB/lPc0yTEHaFbj2F u1UwbjHHzRy8nH0PyobFC3HodxLTXKTmtsdr+XJotgGLXGP47ztQ1lDoPn4d41TvuDuW I3pbTZdJZo1e7M4EvRpZ+Ez+wbREfTtQqfo6Fh5oUxbLnaAIDG9P2fXl53/zplDZeqJ3 51tob4Ce+xGC8VWjFTJlP0VnPfOFiQ2EkMVohypz1rXwu9hvjDxbs5cy9FcKDSt5zaSe 7yVQ== X-Gm-Message-State: AO0yUKWyLQCphcaihxyQaJhxpBJZAJT2zmy2ydRaX259hgwns0mgS05T nlBcD636Jcb34ZNZMcstwG3IN24rIc0lvi3GG4/Qlw8sMdriMA271zu7dk9PRoLxnrWs2Aiv5tq /MvFldL3UPI1l182lXfvV601Y1BHH0lx1PvxC4xUzsOQooADUsDUpWSKc7eH19mJqtZAtddQQYd A= X-Received: by 2002:a17:907:7f0b:b0:888:7ac8:c0f4 with SMTP id qf11-20020a1709077f0b00b008887ac8c0f4mr20938571ejc.25.1678351854253; Thu, 09 Mar 2023 00:50:54 -0800 (PST) X-Google-Smtp-Source: AK7set/U23DODGF/V1BpwEST21vnP9NuK4AOgwh7mkrEQbpHrxWfHUsaaQYALhDtLcPvFqwFcFlmJQ== X-Received: by 2002:a17:907:7f0b:b0:888:7ac8:c0f4 with SMTP id qf11-20020a1709077f0b00b008887ac8c0f4mr20938556ejc.25.1678351853946; Thu, 09 Mar 2023 00:50:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org Subject: [PATCH 1/3] block: make assertion more generic Date: Thu, 9 Mar 2023 09:50:49 +0100 Message-Id: <20230309085051.308664-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309085051.308664-1-pbonzini@redhat.com> References: <20230309085051.308664-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+importer2=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678351925861100005 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 0dd604d0f6a8..075da6517b7f 100644 --- a/block.c +++ b/block.c @@ -1627,8 +1627,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.39.2 From nobody Thu May 2 08:02:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678351879; cv=none; d=zohomail.com; s=zohoarc; b=hUW4XNAS0jJKXXFGdtZfKx4lxO7/U+E5ido82aFlsZRysl4eFGM0s66e5Hyzd1nfYj1boc202EtgH1VtT1bpAxecY+TPlELK0XYTJU6/0Y3kib2/oVDRRZdTfSGuqNl5pgCN1ILOGcCUqIUAHSiP4Hoe3mze1tMpd04YUPAJGxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678351879; 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=M03WwdG34wPjeEEg0rnhkt9BMsbe0esm2loujONRDeM=; b=RAb3l29qKhoS87ZHT0kJ6Gm8wXsacRRtMLpfJOYv0XqLUrFOaI7miz5qqH4uzkH4U9MogjowmeIf9Z9V7DqsQWQigWHlCLk9FXEwQapFoIMyUycedJYgvC3tbhjipjys7S3Hx8SROq6HzymBX4uZzDLQwKks0NSxnyYZ2oCJaCo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678351879939950.5932822751581; Thu, 9 Mar 2023 00:51:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paBzT-0007mg-Cn; Thu, 09 Mar 2023 03:51:11 -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 1paBzJ-0007k5-5L for qemu-devel@nongnu.org; Thu, 09 Mar 2023 03:51:04 -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 1paBzH-00021Z-Fb for qemu-devel@nongnu.org; Thu, 09 Mar 2023 03:51:00 -0500 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-435-sro_wGHoMuWragfHCdFEMQ-1; Thu, 09 Mar 2023 03:50:57 -0500 Received: by mail-ed1-f71.google.com with SMTP id g2-20020a056402320200b004e98d45ee7dso1985404eda.0 for ; Thu, 09 Mar 2023 00:50:57 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id h23-20020a170906719700b008c673cd9ba2sm8484640ejk.126.2023.03.09.00.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 00:50:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678351858; 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=M03WwdG34wPjeEEg0rnhkt9BMsbe0esm2loujONRDeM=; b=fL9ghfGFwhBdccmrjeFJywdk6F17ztbSXfYu8RqNmrWWaDwO/QLiw8hfe+RfoOYUQXMV0m vJJnDQsellBzDcoiwQhFccOFely7E4mTLADCACZ24z7pmdyJNEz8SS3JpQgpyTBnINETK9 wze6K8NGvxtcboLx9ZTEh3c5BXJkI6Y= X-MC-Unique: sro_wGHoMuWragfHCdFEMQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678351855; 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=M03WwdG34wPjeEEg0rnhkt9BMsbe0esm2loujONRDeM=; b=h819uqFY+r5cHyWWgkCmH3/YOt+OsL2zm927URVxT2MV2YVZwHLTsj4dVbQA+iiGCL /VChn5U2NZeXS4KLMmUZRG4RGq8HDYKTOOODYunHDrD6S0Gs+roC6beE7ZgqAoY2FmSd kG0FxCfmA9CkVQ6F2WahvvjQ4k4v8cCJrzh8sqGI7fyaHezKeWxj4RelUnJSW9rl2W81 qV9f8H49RkhGR74qvPZ1Qxf5mLOSRs/hz5uGHOKBbjixQAMKzIrZ5amrpILYA1hxM44K 3k9jzWwpI17dUr5f7pMwfTieK31rzP/5Ye8/4djMkn8tkpqIob8QZrk+kXcMUDa3/FnU AS6w== X-Gm-Message-State: AO0yUKWga2SPf8bOrCADtLHi1igcmsoc7vD/8Oc1gs2Hgg5/skcbdwz2 XfEiH39f4p9v3dXzdFusYcybBPO8P2Vh33D2ozhelj/9QsX9OgFCwGNJ7TYLuH7FZ8XCwDyqSL+ qlCUFTgGYOnT/iPJDkQGEqZbML4MDOWijulvK5hCyO3uq6qS1Vkrcr8q6qMb0MqHq2gE3WF3wzd A= X-Received: by 2002:a17:906:ee82:b0:8b1:304e:589e with SMTP id wt2-20020a170906ee8200b008b1304e589emr26895181ejb.53.1678351855612; Thu, 09 Mar 2023 00:50:55 -0800 (PST) X-Google-Smtp-Source: AK7set+KVdd4iT9KYtwQng5DgQINYhW0LF+4oiBf2FrBOTolWU+wi5lCG7IepPcc2VsI5qS792cDBw== X-Received: by 2002:a17:906:ee82:b0:8b1:304e:589e with SMTP id wt2-20020a170906ee8200b008b1304e589emr26895164ejb.53.1678351855267; Thu, 09 Mar 2023 00:50:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org Subject: [PATCH 2/3] block: do not check bdrv_file_open Date: Thu, 9 Mar 2023 09:50:50 +0100 Message-Id: <20230309085051.308664-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309085051.308664-1-pbonzini@redhat.com> References: <20230309085051.308664-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+importer2=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678351881767100003 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- block.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 075da6517b7f..71f0ea24870e 100644 --- a/block.c +++ b/block.c @@ -914,7 +914,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 @@ -1628,7 +1627,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); @@ -1940,7 +1939,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; @@ -2040,7 +2039,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) { @@ -4000,7 +3999,7 @@ bdrv_open_inherit(const char *filename, const char *r= eference, QDict *options, } =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); @@ -5785,7 +5784,7 @@ int64_t coroutine_fn bdrv_co_get_allocated_file_size(= BlockDriverState *bs) return drv->bdrv_co_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), @@ -7888,7 +7887,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.39.2 From nobody Thu May 2 08:02:28 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1678351897; cv=none; d=zohomail.com; s=zohoarc; b=il2Ro8q7ISZvTAro8nhVheXSHViL3y0ohT82Bh5aakrKm4ClzYhJegP4yCZ5OulMQKu84OAMQAYVYIBaE5ATHLnMnnwMH9WQQIgZo5Yv5pa4K8DK1kpUq8S3mKJD846wOEslfU8lY0LS0UrhfBoYs3dvj+FjLOKitAYKNQEH+NU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678351897; 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=1P2q82UUFuLyMLcsMZJiNAk9mNchF1IyDULsuxJ2WKo=; b=ENsvOMXoyWBz7quPlP5h7MPY1ixZjsLhTqJyzDFK/f8C+85GFyqledwfxBVAD0BuGJsg0PqiY1IeNDQpP0yzQZ8re8l/icZgi3jvosYPeZsXnYpxftMRYqneyodVN8Ye9NH5r2i2CzkHM/Rl/bESN5WfBQ67yhHNsvrllOxbc0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678351897310816.796702744403; Thu, 9 Mar 2023 00:51:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paBzQ-0007m4-IW; Thu, 09 Mar 2023 03:51:09 -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 1paBzP-0007lP-56 for qemu-devel@nongnu.org; Thu, 09 Mar 2023 03:51:07 -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 1paBzM-00022w-T5 for qemu-devel@nongnu.org; Thu, 09 Mar 2023 03:51:06 -0500 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-335-qAb1j_zbOs6nSAYjAmzfNg-1; Thu, 09 Mar 2023 03:50:59 -0500 Received: by mail-ed1-f72.google.com with SMTP id da22-20020a056402177600b004c60694083eso1925065edb.5 for ; Thu, 09 Mar 2023 00:50:58 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bt5-20020a170906b14500b008cca31606a8sm8613135ejb.51.2023.03.09.00.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 00:50:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678351863; 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=1P2q82UUFuLyMLcsMZJiNAk9mNchF1IyDULsuxJ2WKo=; b=PNKku/HeVlXa0Ktyo0vbqnBcGt7iCO2XPDY7Ova5l+pChESy9UBy265JIZtQ7LPDn5SBbI B9IneUTfcy/4NDnWZLuj2yaC8bGsZF65CA0hEQ06szzBL+VVkFYTM8YfkmV7LHm7rqGBAu 8nptcArkw5YyB4LGSdh2X7y74U7rDgQ= X-MC-Unique: qAb1j_zbOs6nSAYjAmzfNg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678351857; 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=1P2q82UUFuLyMLcsMZJiNAk9mNchF1IyDULsuxJ2WKo=; b=7WsiPAbcEkiMuWUDJk856JGcXG/D36eqcS3HI3UOkPsmHsONnQmOHI28XiZTMbP0cB seSdfUWJh8QENfJMA1I7VktSQcHqQ4V9mc9YYlSkBHhxleQy5tHvBH382c/vaSzT9BZO Ub6/9D4xoZEbL5Wi525fKM0CeRjcQ6SpoP6SA7V8kdb/Rj4Nex/jxWeklZZAxTZiWJMg JdM1LV4vMHino0GBsd6onsixmY0ycXpWWuydfpBiakHZd2MQgpeY2UP0XHU94N0v9/KU Fmlx/6iQrC4TlZKDC4N0Qdd6w+fSyeD1JQG6qB1Lav4ujOu2tKKCt3dAvcpAPenfWIHi oBvA== X-Gm-Message-State: AO0yUKXdpi61pN8U7hp6KXyXen+NY+y7vKl/lJX61U3wH5+goI85uHMJ 18N32VSIS7S8RvYu+8O/M3t4doQr+H7RCDE2/GEW7QToPQcw1V5142y9cjaNOzqUeWnyHdKe7JE mNdxkx5zhVr2qcf0jIELJ0zJbroOywUEbngZjHycYNPzLuXIIv2eEDIOVXlvEd3Sxhc9lvmxJ5f A= X-Received: by 2002:a17:907:8686:b0:8f7:5038:9896 with SMTP id qa6-20020a170907868600b008f750389896mr26130817ejc.70.1678351857183; Thu, 09 Mar 2023 00:50:57 -0800 (PST) X-Google-Smtp-Source: AK7set/bYfen0PilbO21AfZS7lkMCWZb3Nf1goKpCfkpsxkbm0qsAZtj1PQ6h4VRe9B+8MLBQIVgMw== X-Received: by 2002:a17:907:8686:b0:8f7:5038:9896 with SMTP id qa6-20020a170907868600b008f750389896mr26130795ejc.70.1678351856824; Thu, 09 Mar 2023 00:50:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org Subject: [PATCH 3/3] block: remove separate bdrv_file_open callback Date: Thu, 9 Mar 2023 09:50:51 +0100 Message-Id: <20230309085051.308664-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309085051.308664-1-pbonzini@redhat.com> References: <20230309085051.308664-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+importer2=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1678351897846100001 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 71f0ea24870e..e6d20f89ba82 100644 --- a/block.c +++ b/block.c @@ -1628,8 +1628,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 addad914b3f7..c9ae3cb6ae3d 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -1072,7 +1072,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 0cdc99a72960..c2efe1a8feec 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -997,7 +997,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_co_getlength =3D blkio_co_getlength, \ .bdrv_co_truncate =3D blkio_truncate, \ diff --git a/block/blkverify.c b/block/blkverify.c index 1c16f86b2e70..9b59b34c02ba 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -312,7 +312,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 8bb39a134e4b..809858692652 100644 --- a/block/curl.c +++ b/block/curl.c @@ -1032,7 +1032,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 @@ -1051,7 +1051,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 @@ -1070,7 +1070,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 @@ -1089,7 +1089,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 5760cf22d17d..578b512ed515 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -3323,7 +3323,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, @@ -3697,7 +3697,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, @@ -3825,7 +3825,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, @@ -3955,7 +3955,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 c7d0b8530637..53f4955e2999 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 185a83e5e533..6b25aa2516ab 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -1553,7 +1553,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, @@ -1582,7 +1582,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, @@ -1611,7 +1611,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, @@ -1646,7 +1646,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 9fc0bed90b81..08c1d2cb0d57 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2427,7 +2427,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, @@ -2466,7 +2466,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 bf2894ad5c9b..4ff1da684e64 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 351dc6ec8d14..4bd43404e53f 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -889,7 +889,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 4808704ffd3a..6fa64d20d865 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 5b744c2bdad4..015a1a3cec9e 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1641,7 +1641,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 978671411ec7..9ea00d82930d 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -1811,8 +1811,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 b3b3352075ff..a7820ba7fde0 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -1357,7 +1357,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 0ddc91fc096a..e0e28713c433 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 d4190173284f..a72d7d2c93a7 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -241,9 +241,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 GRAPH_RDLOCK_PTR (*bdrv_co_create)( --=20 2.39.2