From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vr8HT-0004W7-Gc for qemu-devel@nongnu.org; Thu, 12 Dec 2013 10:34:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vr8HO-0004ef-8p for qemu-devel@nongnu.org; Thu, 12 Dec 2013 10:34:27 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48623 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vr8HN-0004eX-Uv for qemu-devel@nongnu.org; Thu, 12 Dec 2013 10:34:22 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Thu, 12 Dec 2013 16:33:55 +0100 Message-Id: <1386862440-8003-3-git-send-email-benoit@irqsave.net> In-Reply-To: <1386862440-8003-1-git-send-email-benoit@irqsave.net> References: <1386862440-8003-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [PATCH V5 2/7] block: Allow the user to define "node-name" option. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , jcody@redhat.com, armbru@redhat.com, stefanha@redhat.com Signed-off-by: Benoit Canet --- block.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/block.c b/block.c index 481d566..1c57f0d 100644 --- a/block.c +++ b/block.c @@ -735,6 +735,39 @@ static int bdrv_open_flags(BlockDriverState *bs, int flags) return open_flags; } +static int bdrv_get_node_name(BlockDriverState *bs, + QDict *options, + Error **errp) +{ + const char *node_name = NULL; + + node_name = qdict_get_try_str(options, "node-name"); + + if (!node_name) { + return 0; + } + + /* empty string node name is invalid */ + if (node_name[0] == '\0') { + error_setg(errp, "Empty node name"); + return -EINVAL; + } + + /* takes care of avoiding duplicates node names */ + if (bdrv_find_node(node_name)) { + error_setg(errp, "Duplicate node name"); + return -EINVAL; + } + + /* copy node name into the bs and insert it into the graph list */ + pstrcpy(bs->node_name, sizeof(bs->node_name), node_name); + QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs, node_list); + + qdict_del(options, "node-name"); + + return 0; +} + /* * Common part for opening disk images and files * @@ -759,6 +792,11 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name); + ret = bdrv_get_node_name(bs, options, errp); + if (ret < 0) { + return ret; + } + /* bdrv_open() with directly using a protocol as drv. This layer is already * opened, so assign it to bs (while file becomes a closed BlockDriverState) * and return immediately. */ -- 1.8.3.2