[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/22] block: Add blk_name_taken()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 11/22] block: Add blk_name_taken() |
Date: |
Mon, 9 Feb 2015 13:38:33 -0500 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 01/22] iotests: Move _filter_nbd into common.filter, (continued)
- [Qemu-devel] [PATCH v2 01/22] iotests: Move _filter_nbd into common.filter, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 05/22] block: Move BDS close notifiers into BB, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 08/22] block: Use blk_remove_bs() in blk_delete(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 03/22] iotests: Add test for eject under NBD server, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 02/22] iotests: Do not redirect qemu's stderr, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 09/22] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 04/22] quorum: Fix close path, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 10/22] block: Make bdrv_close() static, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 07/22] block: Add bdrv_close_all() handlers, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 06/22] block: Add bdrv_close_all() notifiers, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 11/22] block: Add blk_name_taken(),
Max Reitz <=
- [Qemu-devel] [PATCH v2 14/22] block: Use BlockBackend more, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 12/22] block: Add blk_next_inserted(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 13/22] block: Add blk_commit_all() and blk_invalidate_cache_all(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 17/22] block: Make bdrv_drain_one() public, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 15/22] blockdev: Add list of monitor-owned BlockBackends, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 18/22] block: Move some bdrv_*_all() functions to BB, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 19/22] block: Remove bdrv_states, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 20/22] blockdev: Keep track of monitor-owned BDS, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 16/22] blockdev: Remove blk_hide_on_behalf_of_do_drive_del(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 21/22] block: Strip down bdrv_close_all(), Max Reitz, 2015/02/09