From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VocWU-0008P4-Qh for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:15:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VocWP-0000iQ-Nu for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:15:34 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:44897 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VocWP-0000iE-0V for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:15:29 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Thu, 5 Dec 2013 18:14:58 +0100 Message-Id: <1386263703-19292-3-git-send-email-benoit@irqsave.net> In-Reply-To: <1386263703-19292-1-git-send-email-benoit@irqsave.net> References: <1386263703-19292-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [PATCH V4 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 | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 4f6b36a..61f5ba0 100644 --- a/block.c +++ b/block.c @@ -873,6 +873,7 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, const char *drvname; bool allow_protocol_prefix = false; Error *local_err = NULL; + const char *node_name = NULL; int ret; /* NULL means an empty set of options */ @@ -880,7 +881,15 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, options = qdict_new(); } - bs = bdrv_new("", ""); + node_name = qdict_get_try_str(options, "node-name"); + if (node_name && bdrv_find_node(node_name)) { + error_setg(errp, "Duplicate node name"); + QDECREF(options); + return -EINVAL; + } + bs = bdrv_new("", node_name ? node_name : ""); + qdict_del(options, "node-name"); + bs->options = options; options = qdict_clone_shallow(options); @@ -980,6 +989,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) int back_flags, ret; BlockDriver *back_drv = NULL; Error *local_err = NULL; + const char *node_name = NULL; if (bs->backing_hd != NULL) { QDECREF(options); @@ -1002,7 +1012,14 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) sizeof(backing_filename)); } - bs->backing_hd = bdrv_new("", ""); + node_name = qdict_get_try_str(options, "node-name"); + if (node_name && bdrv_find_node(node_name)) { + error_setg(errp, "Duplicate node name"); + QDECREF(options); + return -EINVAL; + } + bs->backing_hd = bdrv_new("", node_name ? node_name : ""); + qdict_del(options, "node-name"); if (bs->backing_format[0] != '\0') { back_drv = bdrv_find_format(bs->backing_format); @@ -1046,6 +1063,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, BlockDriverState *file = NULL; QDict *file_options = NULL; const char *drvname; + const char *node_name = NULL; Error *local_err = NULL; /* NULL means an empty set of options */ @@ -1053,6 +1071,22 @@ int bdrv_open(BlockDriverState *bs, const char *filename, QDict *options, options = qdict_new(); } + node_name = qdict_get_try_str(options, "node-name"); + if (node_name && bdrv_find_node(node_name)) { + error_setg(errp, "Duplicate node name"); + QDECREF(options); + return -EINVAL; + } + + if (node_name) { + pstrcpy(bs->node_name, sizeof(bs->node_name), node_name); + if (node_name[0] != '\0') { + QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs, node_list); + } + } + + qdict_del(options, "node-name"); + bs->options = options; options = qdict_clone_shallow(options); @@ -1646,9 +1680,9 @@ static void bdrv_move_feature_fields(BlockDriverState *bs_dest, bs_src->device_name); bs_dest->device_list = bs_src->device_list; - /* keep the same entry in graph_bdrv_states */ - pstrcpy(bs_dest->node_name, sizeof(bs_dest->node_name), - bs_src->node_name); + /* keep the same entry in graph_bdrv_states + * We do want to swap name but don't want to swap linked list entries + */ bs_dest->node_list = bs_src->node_list; } -- 1.8.3.2