From patchwork Mon Oct 12 23:36:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 529516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9CBE9140DA5 for ; Tue, 13 Oct 2015 10:37:43 +1100 (AEDT) Received: from localhost ([::1]:59305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlmez-0007W8-DC for incoming@patchwork.ozlabs.org; Mon, 12 Oct 2015 19:37:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlmeN-0006LY-Nb for qemu-devel@nongnu.org; Mon, 12 Oct 2015 19:37:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlmeM-0006It-P8 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 19:37:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlmeK-0006H7-87; Mon, 12 Oct 2015 19:37:00 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E8F2A8C1B8; Mon, 12 Oct 2015 23:36:59 +0000 (UTC) Received: from localhost (ovpn-112-41.phx2.redhat.com [10.3.112.41]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9CNawsk026998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA256 bits=256 verify=NO); Mon, 12 Oct 2015 19:36:59 -0400 From: Jeff Cody To: qemu-devel@nongnu.org Date: Mon, 12 Oct 2015 19:36:50 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-block@nongnu.org, jsnow@redhat.com, armbru@redhat.com, programmingkidx@gmail.com, berto@igalia.com Subject: [Qemu-devel] [PATCH v3 2/4] block: auto-generated node-names X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Markus Armbruster --- block.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 1f90b47..5947704 100644 --- a/block.c +++ b/block.c @@ -763,12 +763,15 @@ 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)) { + node_name = gen_node_name = id_generate(ID_BLOCK); + } else if (!id_wellformed(node_name)) { + /* + * Check for empty string or invalid characters, but not if it is + * generated (generated names use characters not available to the user) + */ error_setg(errp, "Invalid node name"); return; } @@ -777,18 +780,20 @@ static void bdrv_assign_node_name(BlockDriverState *bs, 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 = {