@@ -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;
@@ -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)
@@ -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);