From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzOGI-0003oF-MT for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:43:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzOGF-0007sk-Sc for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:43:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36723) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzOGF-0007sf-L3 for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:43:03 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6H9h3iX007883 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 17 Jul 2013 05:43:03 -0400 From: Fam Zheng Date: Wed, 17 Jul 2013 17:42:11 +0800 Message-Id: <1374054136-28741-7-git-send-email-famz@redhat.com> In-Reply-To: <1374054136-28741-1-git-send-email-famz@redhat.com> References: <1374054136-28741-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 06/11] xen_disk: simplify blk_disconnect with refcnt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, hbrock@redhat.com, rjones@redhat.com, imain@redhat.com, stefanha@redhat.com, pbonzini@redhat.com We call bdrv_attach_dev when initializing whether or not bs is created locally, so call bdrv_detach_dev and let the refcnt handle the lifecycle. Signed-off-by: Fam Zheng --- hw/block/xen_disk.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 247f32f..ae17acc 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -910,12 +910,7 @@ static void blk_disconnect(struct XenDevice *xendev) struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev); if (blkdev->bs) { - if (!blkdev->dinfo) { - /* close/delete only if we created it ourself */ - bdrv_close(blkdev->bs); - bdrv_detach_dev(blkdev->bs, blkdev); - bdrv_delete(blkdev->bs); - } + bdrv_detach_dev(blkdev->bs, blkdev); blkdev->bs = NULL; } xen_be_unbind_evtchn(&blkdev->xendev); -- 1.8.3.2