From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLk5s-0002CJ-DO for qemu-devel@nongnu.org; Wed, 11 Feb 2015 22:05:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLk5n-00019N-4n for qemu-devel@nongnu.org; Wed, 11 Feb 2015 22:05:32 -0500 Received: from [59.151.112.132] (port=57794 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLk5h-00014D-Im for qemu-devel@nongnu.org; Wed, 11 Feb 2015 22:05:27 -0500 From: Wen Congyang Date: Thu, 12 Feb 2015 11:07:12 +0800 Message-ID: <1423710438-14377-9-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1423710438-14377-1-git-send-email-wency@cn.fujitsu.com> References: <1423710438-14377-1-git-send-email-wency@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [RFC PATCH 08/14] block: add a new API to create a hidden BlockBackend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel , Kevin Wolf , Stefan Hajnoczi , Paolo Bonzini Cc: Lai Jiangshan , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Yang Hongyang , zhanghailiang Signed-off-by: Wen Congyang Signed-off-by: zhanghailiang Signed-off-by: Gonglei --- block/block-backend.c | 29 ++++++++++++++++++++++++++++- include/sysemu/block-backend.h | 2 ++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index c28e240..1bbc078 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -72,6 +72,19 @@ BlockBackend *blk_new(const char *name, Error **errp) } /* + * Create a new hidden BlockBackend, with a reference count of one. + * Return the new BlockBackend on success, null on failure. + */ +BlockBackend *blk_hide_new(void) +{ + BlockBackend *blk; + + blk = g_new0(BlockBackend, 1); + blk->refcnt = 1; + return blk; +} + +/* * Create a new BlockBackend with a new BlockDriverState attached. * Otherwise just like blk_new(), which see. */ @@ -91,6 +104,20 @@ BlockBackend *blk_new_with_bs(const char *name, Error **errp) return blk; } +/* + * Create a new hidden BlockBackend with a new BlockDriverState attached. + * Otherwise just like blk_hide_new(), which see. + */ +BlockBackend *blk_hide_new_with_bs(void) +{ + BlockBackend *blk = blk_hide_new(); + BlockDriverState *bs = bdrv_new(); + + blk->bs = bs; + bs->blk = blk; + return blk; +} + static void blk_delete(BlockBackend *blk) { assert(!blk->refcnt); @@ -102,7 +129,7 @@ static void blk_delete(BlockBackend *blk) blk->bs = NULL; } /* Avoid double-remove after blk_hide_on_behalf_of_do_drive_del() */ - if (blk->name[0]) { + if (blk->name && blk->name[0]) { QTAILQ_REMOVE(&blk_backends, blk, link); } g_free(blk->name); diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index aab12b9..acc50f5 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -61,7 +61,9 @@ typedef struct BlockDevOps { } BlockDevOps; BlockBackend *blk_new(const char *name, Error **errp); +BlockBackend *blk_hide_new(void); BlockBackend *blk_new_with_bs(const char *name, Error **errp); +BlockBackend *blk_hide_new_with_bs(void); void blk_ref(BlockBackend *blk); void blk_unref(BlockBackend *blk); const char *blk_name(BlockBackend *blk); -- 2.1.0