From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcvKg-0005cg-ES for qemu-devel@nongnu.org; Fri, 18 Sep 2015 09:04:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcvKa-0005Aa-7I for qemu-devel@nongnu.org; Fri, 18 Sep 2015 09:04:06 -0400 From: Markus Armbruster References: Date: Fri, 18 Sep 2015 15:03:51 +0200 In-Reply-To: (Jeff Cody's message of "Tue, 1 Sep 2015 18:30:16 -0400") Message-ID: <87fv2b3mmg.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v2 2/2] block: auto-generated node-names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody Cc: kwolf@redhat.com, programmingkidx@gmail.com, jsnow@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Jeff Cody writes: > If a node-name is not specified, automatically generate the node-name. > > Generated node-names will use the "block" sub-system identifier. > > Reviewed-by: Eric Blake > Reviewed-by: John Snow > Signed-off-by: Jeff Cody > --- > block.c | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) > > diff --git a/block.c b/block.c > index d088ee0..892e127 100644 > --- a/block.c > +++ b/block.c > @@ -771,32 +771,39 @@ static void bdrv_assign_node_name(BlockDriverState *bs, > const char *node_name, > Error **errp) > { > + char *gen_node_name = NULL; > + > if (!node_name) { > - return; > - } > - > - /* Check for empty string or invalid characters */ > - if (!id_wellformed(node_name)) { > - error_setg(errp, "Invalid node name"); > - return; > + gen_node_name = id_generate(ID_BLOCK); > + node_name = gen_node_name; I'd do node_name = gen_node_name = id_generate(ID_BLOCK); but that's clearly a matter of taste. > + } else { > + /* Check for empty string or invalid characters, but not if it is > + * generated (generated names use characters not available to the user) > + * */ Untidy comment. Make it: /* * Check for empty string or invalid characters, but not if it * is generated (generated names use characters not available to * the user) */ > + if (!id_wellformed(node_name)) { > + error_setg(errp, "Invalid node name"); > + return; > + } > } I'd probably do an else if here. Additional benefit: smaller diff. > > /* takes care of avoiding namespaces collisions */ > if (blk_by_name(node_name)) { > error_setg(errp, "node-name=%s is conflicting with a device id", > node_name); > - return; > + goto out; > } > > /* takes care of avoiding duplicates node names */ > if (bdrv_find_node(node_name)) { > error_setg(errp, "Duplicate node name"); > - return; > + goto out; > } > > /* 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); > +out: > + g_free(gen_node_name); > } > > static QemuOptsList bdrv_runtime_opts = {