From patchwork Sat Sep 13 15:00:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 388918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3063A14011B for ; Sun, 14 Sep 2014 01:11:53 +1000 (EST) Received: from localhost ([::1]:50116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSozP-0004gP-AJ for incoming@patchwork.ozlabs.org; Sat, 13 Sep 2014 11:11:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSooo-0002PC-Hp for qemu-devel@nongnu.org; Sat, 13 Sep 2014 11:01:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSooi-00029C-3C for qemu-devel@nongnu.org; Sat, 13 Sep 2014 11:00:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSooh-000293-Sz for qemu-devel@nongnu.org; Sat, 13 Sep 2014 11:00:48 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8DF0iYR026203 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Sat, 13 Sep 2014 11:00:44 -0400 Received: from blackfin.pond.sub.org (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8DF0cB1017481 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 13 Sep 2014 11:00:44 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9BB5A3042B9F; Sat, 13 Sep 2014 17:00:29 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Sat, 13 Sep 2014 17:00:27 +0200 Message-Id: <1410620427-20089-24-git-send-email-armbru@redhat.com> In-Reply-To: <1410620427-20089-1-git-send-email-armbru@redhat.com> References: <1410620427-20089-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, benoit.canet@nodalink.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 23/23] block: Make device model's references to BlockBackend strong 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Doesn't make a difference just yet, but it's the right thing to do. Signed-off-by: Markus Armbruster --- block/block-backend.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index 9c504f3..17285ba 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -251,6 +251,7 @@ int blk_attach_dev(BlockBackend *blk, void *dev) if (blk->dev) { return -EBUSY; } + blk_ref(blk); blk->dev = dev; bdrv_iostatus_reset(blk->bs); @@ -279,9 +280,10 @@ void blk_detach_dev(BlockBackend *blk, void *dev) /* TODO change to DeviceState *dev when all users are qdevified */ { assert(blk->dev == dev); - blk->dev = NULL; blk->dev_ops = NULL; blk->dev_opaque = NULL; + blk->dev = NULL; + blk_unref(blk); bdrv_set_guest_block_size(blk->bs, 512); qemu_coroutine_adjust_pool_size(-COROUTINE_POOL_RESERVATION); }