From patchwork Tue Mar 29 15:08:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 8688061 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 87B229F36E for ; Tue, 29 Mar 2016 15:14:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 27E85201C0 for ; Tue, 29 Mar 2016 15:13:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 76755201B9 for ; Tue, 29 Mar 2016 15:13:58 +0000 (UTC) Received: from localhost ([::1]:47723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvLB-0001im-Nr for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Mar 2016 11:13:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvGw-0002rt-6N for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akvGq-00065p-21 for qemu-devel@nongnu.org; Tue, 29 Mar 2016 11:09:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akvGj-000630-4G; Tue, 29 Mar 2016 11:09:21 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id D878B7302B; Tue, 29 Mar 2016 15:09:20 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-120.ams2.redhat.com [10.36.116.120]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2TF912j011786; Tue, 29 Mar 2016 11:09:19 -0400 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 29 Mar 2016 17:08:08 +0200 Message-Id: <1459264128-12761-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1459264128-12761-1-git-send-email-kwolf@redhat.com> References: <1459264128-12761-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 29 Mar 2016 15:09:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 08/48] block: Remove blk_set_bs() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function is unused since commit f21d96d0 ('block: Use BdrvChild in BlockBackend'). Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block/block-backend.c | 17 ----------------- include/block/block_int.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/block/block-backend.c b/block/block-backend.c index dca21d1..4b44d46 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -371,23 +371,6 @@ BlockDriverState *blk_bs(BlockBackend *blk) } /* - * Changes the BlockDriverState attached to @blk - */ -void blk_set_bs(BlockBackend *blk, BlockDriverState *bs) -{ - bdrv_ref(bs); - - if (blk->root) { - blk->root->bs->blk = NULL; - bdrv_root_unref_child(blk->root); - } - assert(bs->blk == NULL); - - blk->root = bdrv_root_attach_child(bs, "root", &child_root); - bs->blk = blk; -} - -/* * Return @blk's DriveInfo if any, else null. */ DriveInfo *blk_legacy_dinfo(BlockBackend *blk) diff --git a/include/block/block_int.h b/include/block/block_int.h index ba6e9ac..a33b0de 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -704,8 +704,6 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, const BdrvChildRole *child_role); void bdrv_root_unref_child(BdrvChild *child); -void blk_set_bs(BlockBackend *blk, BlockDriverState *bs); - void blk_dev_change_media_cb(BlockBackend *blk, bool load); bool blk_dev_has_removable_media(BlockBackend *blk); bool blk_dev_has_tray(BlockBackend *blk);