[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 04/14] block: Add blk_name_taken()
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v3 04/14] block: Add blk_name_taken() |
Date: |
Tue, 16 Feb 2016 19:08:16 +0100 |
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>
---
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 efc3c43..a119840 100644
--- a/block.c
+++ b/block.c
@@ -847,8 +847,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);
goto out;
diff --git a/block/block-backend.c b/block/block-backend.c
index 30decb4..45d4057 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -87,7 +87,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;
}
@@ -291,6 +291,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 = NULL;
+
+ while ((blk = blk_all_next(blk)) != NULL) {
+ 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 ec30331..3fbf822 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -71,6 +71,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.7.1
- [Qemu-block] [PATCH v3 00/14] blockdev: Further BlockBackend work, Max Reitz, 2016/02/16
- [Qemu-block] [PATCH v3 02/14] block: Use blk_next() where appropriate, Max Reitz, 2016/02/16
- [Qemu-block] [PATCH v3 01/14] monitor: Use BB list for BB name completion, Max Reitz, 2016/02/16
- [Qemu-block] [PATCH v3 03/14] block: Add blk_all_next(), Max Reitz, 2016/02/16
- [Qemu-block] [PATCH v3 05/14] block: Add blk_commit_all(), Max Reitz, 2016/02/16
- [Qemu-block] [PATCH v3 06/14] block: Use blk_{commit, flush}_all() consistently, Max Reitz, 2016/02/16
- [Qemu-block] [PATCH v3 04/14] block: Add blk_name_taken(),
Max Reitz <=
- [Qemu-block] [PATCH v3 08/14] blockdev: Remove blk_hide_on_behalf_of_hmp_drive_del(), Max Reitz, 2016/02/16
- [Qemu-block] [PATCH v3 07/14] blockdev: Add list of monitor-owned BlockBackends, Max Reitz, 2016/02/16