From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQIGl-0007Mo-OA for qemu-devel@nongnu.org; Tue, 24 Feb 2015 11:23:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQIGk-0006th-Ny for qemu-devel@nongnu.org; Tue, 24 Feb 2015 11:23:35 -0500 From: Max Reitz Date: Tue, 24 Feb 2015 11:23:12 -0500 Message-Id: <1424795000-26494-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1424795000-26494-1-git-send-email-mreitz@redhat.com> References: <1424795000-26494-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 1/9] block: Add blk_name_taken() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: Kevin Wolf , Markus Armbruster , 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 a2637b6..1badb75 100644 --- a/block.c +++ b/block.c @@ -930,8 +930,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 2e820fe..e2e70d2 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -85,7 +85,7 @@ BlockBackend *blk_new(const char *name, Error **errp) 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; } @@ -263,6 +263,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 ab765a7..b9eae9b 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -70,6 +70,7 @@ void blk_unref(BlockBackend *blk); void blk_remove_all_bs(void); 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