Received: from eggs.gnu.org ([2001:4830:134:3::10]:52673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgF7z-0007bM-ND for qemu-devel@nongnu.org; Tue, 12 Nov 2013 09:39:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgF7u-0007Q6-Gj for qemu-devel@nongnu.org; Tue, 12 Nov 2013 09:39:39 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43399 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgF7u-0007Q0-64 for qemu-devel@nongnu.org; Tue, 12 Nov 2013 09:39:34 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 12 Nov 2013 15:39:17 +0100 Message-Id: <1384267158-13371-3-git-send-email-benoit@irqsave.net> In-Reply-To: <1384267158-13371-1-git-send-email-benoit@irqsave.net> References: <1384267158-13371-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V2 2/3] 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 | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index c397ee9..6690e3d 100644 --- a/block.c +++ b/block.c @@ -872,6 +872,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 */ @@ -879,7 +880,14 @@ 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"); + return -EINVAL; + } + bs = bdrv_new("", node_name ? node_name : ""); + qdict_del(options, "node-name"); + bs->options = options; options = qdict_clone_shallow(options); @@ -979,6 +987,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); @@ -1001,7 +1010,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); -- 1.8.3.2