From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtEd-0004GL-4b for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKtEZ-0005XB-3l for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:39:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKtEY-0005Wk-S7 for qemu-devel@nongnu.org; Mon, 09 Feb 2015 13:38:59 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19IcwDW022663 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 13:38:58 -0500 From: Max Reitz Date: Mon, 9 Feb 2015 13:38:33 -0500 Message-Id: <1423507124-29809-12-git-send-email-mreitz@redhat.com> In-Reply-To: <1423507124-29809-1-git-send-email-mreitz@redhat.com> References: <1423507124-29809-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/22] block: Add blk_name_taken() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi , Max Reitz There may be BlockBackends which are not returned by blk_by_name(), but do exist and have a name. blk_name_taken() allows testing whether a specific name is in use already, independent of whether the BlockBackend with that name is accessible through blk_by_name(). Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block.c | 4 ++-- block/block-backend.c | 19 ++++++++++++++++++- include/sysemu/block-backend.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 1590cb3..5bf74b7 100644 --- a/block.c +++ b/block.c @@ -899,8 +899,8 @@ static void bdrv_assign_node_name(BlockDriverState *bs, return; } - /* takes care of avoiding namespaces collisions */ - if (blk_by_name(node_name)) { + /* takes care of avoiding namespace collisions */ + if (blk_name_taken(node_name)) { error_setg(errp, "node-name=%s is conflicting with a device id", node_name); return; diff --git a/block/block-backend.c b/block/block-backend.c index bcad1dc..c54792d 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -86,7 +86,7 @@ BlockBackend *blk_new(const char *name, Notifier *close_all_notifier, error_setg(errp, "Invalid device name"); return NULL; } - if (blk_by_name(name)) { + if (blk_name_taken(name)) { error_setg(errp, "Device with id '%s' already exists", name); return NULL; } @@ -262,6 +262,23 @@ BlockBackend *blk_by_name(const char *name) } /* + * This function should be used to check whether a certain BlockBackend name is + * already taken; blk_by_name() will only search in the list of monitor-owned + * BlockBackends which is not necessarily complete. + */ +bool blk_name_taken(const char *name) +{ + BlockBackend *blk; + + QTAILQ_FOREACH(blk, &blk_backends, link) { + if (!strcmp(name, blk->name)) { + return true; + } + } + return false; +} + +/* * Return the BlockDriverState attached to @blk if any, else null. */ BlockDriverState *blk_bs(BlockBackend *blk) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 9840fef..3790c9b 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -72,6 +72,7 @@ void blk_ref(BlockBackend *blk, Notifier *close_all_notifier); void blk_unref(BlockBackend *blk, Notifier *close_all_notifier); const char *blk_name(BlockBackend *blk); BlockBackend *blk_by_name(const char *name); +bool blk_name_taken(const char *name); BlockBackend *blk_next(BlockBackend *blk); BlockDriverState *blk_bs(BlockBackend *blk); -- 2.1.0