From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4E2B0CF31B0 for ; Wed, 2 Oct 2024 10:45:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1svwr7-0005Eo-L6; Wed, 02 Oct 2024 06:45:17 -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 1svwr3-0005E2-CU for qemu-devel@nongnu.org; Wed, 02 Oct 2024 06:45:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1svwr1-0002v4-Ln for qemu-devel@nongnu.org; Wed, 02 Oct 2024 06:45:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727865911; 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:autocrypt:autocrypt; bh=ue3DTV1r4Qpr0FPmYGYIUyFyOTcGLiCNiOvL4dHrRFE=; b=BWrsTQh+mjE43soO7o7O49AXTQzAOxVlHpXA9QOZgh7LecXuzCyM4Uylb1DkUx3QWhYlSS X1Gftt1SDCtjFm+QE0GwTG3hhnMNrngIsFdJjNxOjGALEFSHrUZiEKB3O0njZ3mExpQpRt +IHw/vXw/znJc3JgL/BtGPAF8QgeN7Y= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-84-XJGIKUdbM5OSfZ-qrdE4aQ-1; Wed, 02 Oct 2024 06:45:09 -0400 X-MC-Unique: XJGIKUdbM5OSfZ-qrdE4aQ-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-42e77b5d3dcso43042225e9.1 for ; Wed, 02 Oct 2024 03:45:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727865908; x=1728470708; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ue3DTV1r4Qpr0FPmYGYIUyFyOTcGLiCNiOvL4dHrRFE=; b=ZCv6uNqKgriQZd4kNZsZD3xm0sRbEDAaJlzXhRARvfvyqJBOalZ6g2sAjlFgs9oj47 ZOr5frTTLkliJ8sJDLy2rqutK7i5jbjH3L1jAUNidVDxCZ0NLPdDAhgJHrDfVv4Q+e9J OfJFJ59npL+GHDm54gAdNm5gtA1QmiYdQuABojiSihHk2ikDgkskIqRfMcHODUu4osce vcg/d3xOR2xJbsqmVRcIm0vVXgZQnK3/papmdpbpFrbMC0mK23ot9egmWLOM0FAXFYF0 l+Rp3wBYuufVirij5X3GLgz0Et1cgZLrEAUMOJ2fj8mJ8r/QhWmFHR0/Sk+L1wtYgVnr Ljow== X-Forwarded-Encrypted: i=1; AJvYcCXPJ8EsRS+sVJxaGhyU98uIdPFFFWDe++H7wMZcmJB165agRKMrBPtllWTn0dhMYFt/6rwEpyFpbx/y@nongnu.org X-Gm-Message-State: AOJu0YwrcC0nFPtaJueEomv4fCB4A6irRV/D/TYBUrDuydEhtE0EYaOB pZFfBSh4q907zGwY7maNba23MWiKI7IwmG0jnhJk8BDqyFYv9NSz3nQnx1khisqYZLkLObvnhxz GF9uspZuNPGTgHFDWRk8P0KLUrjU/86KjIcl4eiAxQNt+yluALvjGS2LQBEz7tEE= X-Received: by 2002:a05:600c:1d1f:b0:42c:b22e:fbfa with SMTP id 5b1f17b1804b1-42f777dba40mr17665535e9.21.1727865908333; Wed, 02 Oct 2024 03:45:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNpO8ewpCb381GNY0IuIeaFhkGI8GrFRjdAQ2gOriciX5FxmXo3gtZsIdlp3qdfsUcLaj2Eg== X-Received: by 2002:a05:600c:1d1f:b0:42c:b22e:fbfa with SMTP id 5b1f17b1804b1-42f777dba40mr17665375e9.21.1727865907874; Wed, 02 Oct 2024 03:45:07 -0700 (PDT) Received: from [192.168.0.7] (ip-109-42-49-143.web.vodafone.de. [109.42.49.143]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f7a01f4a4sm15185315e9.29.2024.10.02.03.45.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Oct 2024 03:45:07 -0700 (PDT) Message-ID: <17c2adb4-9346-46dc-a93b-b0bfa3207cfe@redhat.com> Date: Wed, 2 Oct 2024 12:45:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] block-backend: Remove deadcode To: dave@treblig.org, kwolf@redhat.com, hreitz@redhat.com, QEMU Trivial Cc: qemu-block@nongnu.org, qemu-devel@nongnu.org References: <20240917002056.330818-1-dave@treblig.org> From: Thomas Huth Content-Language: en-US Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240917002056.330818-1-dave@treblig.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@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.144, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 17/09/2024 02.20, dave@treblig.org wrote: > From: "Dr. David Alan Gilbert" > > blk_by_public last use was removed in 2017 by > c61791fc23 ("block: add aio_context field in ThrottleGroupMember") > > blk_activate last use was removed earlier this year by > eef0bae3a7 ("migration: Remove block migration") > > blk_add_insert_bs_notifier, blk_op_block_all, blk_op_unblock_all > last uses were removed in 2016 by > ef8875b549 ("virtio-scsi: Remove op blocker for dataplane") > > blk_iostatus_disable last use was removed in 2016 by > 66a0fae438 ("blockjob: Don't touch BDS iostatus") > > Remove them. > > Signed-off-by: Dr. David Alan Gilbert > --- > block/block-backend.c | 73 --------------------- > include/sysemu/block-backend-global-state.h | 8 --- > 2 files changed, 81 deletions(-) > > diff --git a/block/block-backend.c b/block/block-backend.c > index db6f9b92a3..7bea43bf72 100644 > --- a/block/block-backend.c > +++ b/block/block-backend.c > @@ -853,15 +853,6 @@ BlockBackendPublic *blk_get_public(BlockBackend *blk) > return &blk->public; > } > > -/* > - * Returns a BlockBackend given the associated @public fields. > - */ > -BlockBackend *blk_by_public(BlockBackendPublic *public) > -{ > - GLOBAL_STATE_CODE(); > - return container_of(public, BlockBackend, public); > -} > - > /* > * Disassociates the currently associated BlockDriverState from @blk. > */ > @@ -1214,12 +1205,6 @@ BlockDeviceIoStatus blk_iostatus(const BlockBackend *blk) > return blk->iostatus; > } > > -void blk_iostatus_disable(BlockBackend *blk) > -{ > - GLOBAL_STATE_CODE(); > - blk->iostatus_enabled = false; > -} > - > void blk_iostatus_reset(BlockBackend *blk) > { > GLOBAL_STATE_CODE(); > @@ -2228,28 +2213,6 @@ void blk_set_enable_write_cache(BlockBackend *blk, bool wce) > blk->enable_write_cache = wce; > } > > -void blk_activate(BlockBackend *blk, Error **errp) > -{ > - BlockDriverState *bs = blk_bs(blk); > - GLOBAL_STATE_CODE(); > - > - if (!bs) { > - error_setg(errp, "Device '%s' has no medium", blk->name); > - return; > - } > - > - /* > - * Migration code can call this function in coroutine context, so leave > - * coroutine context if necessary. > - */ > - if (qemu_in_coroutine()) { > - bdrv_co_activate(bs, errp); > - } else { > - GRAPH_RDLOCK_GUARD_MAINLOOP(); > - bdrv_activate(bs, errp); > - } > -} > - > bool coroutine_fn blk_co_is_inserted(BlockBackend *blk) > { > BlockDriverState *bs = blk_bs(blk); > @@ -2380,36 +2343,6 @@ bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp) > return bdrv_op_is_blocked(bs, op, errp); > } > > -void blk_op_unblock(BlockBackend *blk, BlockOpType op, Error *reason) > -{ > - BlockDriverState *bs = blk_bs(blk); > - GLOBAL_STATE_CODE(); > - > - if (bs) { > - bdrv_op_unblock(bs, op, reason); > - } > -} > - > -void blk_op_block_all(BlockBackend *blk, Error *reason) > -{ > - BlockDriverState *bs = blk_bs(blk); > - GLOBAL_STATE_CODE(); > - > - if (bs) { > - bdrv_op_block_all(bs, reason); > - } > -} > - > -void blk_op_unblock_all(BlockBackend *blk, Error *reason) > -{ > - BlockDriverState *bs = blk_bs(blk); > - GLOBAL_STATE_CODE(); > - > - if (bs) { > - bdrv_op_unblock_all(bs, reason); > - } > -} > - > /** > * Return BB's current AioContext. Note that this context may change > * concurrently at any time, with one exception: If the BB has a root node > @@ -2564,12 +2497,6 @@ void blk_add_remove_bs_notifier(BlockBackend *blk, Notifier *notify) > notifier_list_add(&blk->remove_bs_notifiers, notify); > } > > -void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify) > -{ > - GLOBAL_STATE_CODE(); > - notifier_list_add(&blk->insert_bs_notifiers, notify); > -} > - > BlockAcctStats *blk_get_stats(BlockBackend *blk) > { > IO_CODE(); > diff --git a/include/sysemu/block-backend-global-state.h b/include/sysemu/block-backend-global-state.h > index 49c12b0fa9..9cc9b008ec 100644 > --- a/include/sysemu/block-backend-global-state.h > +++ b/include/sysemu/block-backend-global-state.h > @@ -54,7 +54,6 @@ bool monitor_add_blk(BlockBackend *blk, const char *name, Error **errp); > void monitor_remove_blk(BlockBackend *blk); > > BlockBackendPublic *blk_get_public(BlockBackend *blk); > -BlockBackend *blk_by_public(BlockBackendPublic *public); > > void blk_remove_bs(BlockBackend *blk); > int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp); > @@ -67,7 +66,6 @@ void blk_get_perm(BlockBackend *blk, uint64_t *perm, uint64_t *shared_perm); > > void blk_iostatus_enable(BlockBackend *blk); > BlockDeviceIoStatus blk_iostatus(const BlockBackend *blk); > -void blk_iostatus_disable(BlockBackend *blk); > void blk_iostatus_reset(BlockBackend *blk); > int blk_attach_dev(BlockBackend *blk, DeviceState *dev); > void blk_detach_dev(BlockBackend *blk, DeviceState *dev); > @@ -76,8 +74,6 @@ BlockBackend *blk_by_dev(void *dev); > BlockBackend *blk_by_qdev_id(const char *id, Error **errp); > void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaque); > > -void blk_activate(BlockBackend *blk, Error **errp); > - > int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags); > void blk_aio_cancel(BlockAIOCB *acb); > int blk_commit_all(void); > @@ -91,9 +87,6 @@ bool blk_is_sg(BlockBackend *blk); > void blk_set_enable_write_cache(BlockBackend *blk, bool wce); > int blk_get_flags(BlockBackend *blk); > bool blk_op_is_blocked(BlockBackend *blk, BlockOpType op, Error **errp); > -void blk_op_unblock(BlockBackend *blk, BlockOpType op, Error *reason); > -void blk_op_block_all(BlockBackend *blk, Error *reason); > -void blk_op_unblock_all(BlockBackend *blk, Error *reason); > int blk_set_aio_context(BlockBackend *blk, AioContext *new_context, > Error **errp); > void blk_add_aio_context_notifier(BlockBackend *blk, > @@ -105,7 +98,6 @@ void blk_remove_aio_context_notifier(BlockBackend *blk, > void (*detach_aio_context)(void *), > void *opaque); > void blk_add_remove_bs_notifier(BlockBackend *blk, Notifier *notify); > -void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify); > BlockBackendRootState *blk_get_root_state(BlockBackend *blk); > void blk_update_root_state(BlockBackend *blk); > bool blk_get_detect_zeroes_from_root_state(BlockBackend *blk); Reviewed-by: Thomas Huth