From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzOG2-0003Gy-IB for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:42:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzOFz-0007na-Oj for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:42:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzOFz-0007nU-Gd for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:42:47 -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 r6H9gklx014629 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 17 Jul 2013 05:42:47 -0400 From: Fam Zheng Date: Wed, 17 Jul 2013 17:42:08 +0800 Message-Id: <1374054136-28741-4-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 03/11] block: use refcnt for drive_init/drive_uninit 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 Signed-off-by: Fam Zheng --- blockdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index c5abd65..bb986a1 100644 --- a/blockdev.c +++ b/blockdev.c @@ -212,7 +212,7 @@ static void bdrv_format_print(void *opaque, const char *name) static void drive_uninit(DriveInfo *dinfo) { qemu_opts_del(dinfo->opts); - bdrv_delete(dinfo->bdrv); + bdrv_unref(dinfo->bdrv, false); g_free(dinfo->id); QTAILQ_REMOVE(&drives, dinfo, next); g_free(dinfo->serial); @@ -709,8 +709,10 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) goto err; } - if (bdrv_key_required(dinfo->bdrv)) + bdrv_ref(dinfo->bdrv, false); + if (bdrv_key_required(dinfo->bdrv)) { autostart = 0; + } qemu_opts_del(opts); -- 1.8.3.2