From patchwork Fri Apr 8 17:10:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8785031 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 E59F69F36E for ; Fri, 8 Apr 2016 17:13:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 68CF4202EB for ; Fri, 8 Apr 2016 17:13:32 +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 C344220295 for ; Fri, 8 Apr 2016 17:13:31 +0000 (UTC) Received: from localhost ([::1]:57386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoZyN-0000os-25 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 13:13:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoZve-0004KW-7H for qemu-devel@nongnu.org; Fri, 08 Apr 2016 13:10:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoZvc-0002cX-Li for qemu-devel@nongnu.org; Fri, 08 Apr 2016 13:10:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46667) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoZvY-0002Ze-Aj; Fri, 08 Apr 2016 13:10:36 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 10120C05E16D; Fri, 8 Apr 2016 17:10:36 +0000 (UTC) Received: from localhost (ovpn-116-78.ams2.redhat.com [10.36.116.78]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u38HAYsi019650 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 8 Apr 2016 13:10:35 -0400 From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 8 Apr 2016 19:10:15 +0200 Message-Id: <1460135415-21763-9-git-send-email-mreitz@redhat.com> In-Reply-To: <1460135415-21763-1-git-send-email-mreitz@redhat.com> References: <1460135415-21763-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 for-2.7 8/8] block: Drop bdrv_parent_cb_...() from bdrv_close() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 bdrv_close() now asserts that the BDS's refcount is 0, therefore it cannot have any parents and the bdrv_parent_cb_change_media() call is a no-op. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf --- block.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/block.c b/block.c index 6f5b84c..48e1741 100644 --- a/block.c +++ b/block.c @@ -2118,8 +2118,6 @@ static void bdrv_close(BlockDriverState *bs) bdrv_release_named_dirty_bitmaps(bs); assert(QLIST_EMPTY(&bs->dirty_bitmaps)); - bdrv_parent_cb_change_media(bs, false); - if (bs->drv) { BdrvChild *child, *next;