diff mbox series

[v6,8/9] chardev/char.c: Check for duplicate id before creating chardev

Message ID b6d4b5712afc095f3d315818723809a20a2de21e.1596184200.git.lukasstraub2@web.de
State New
Headers show
Series [v6,1/9] Introduce yank feature | expand

Commit Message

Lukas Straub July 31, 2020, 9:27 a.m. UTC 
yank_register_instance (called when creating the new chardev object)
aborts if the instance already exists. So check for duplicate id before
creating the new chardev to prevent this.

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
 chardev/char.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--
2.20.1
diff mbox series

Patch

diff --git a/chardev/char.c b/chardev/char.c
index 77e7ec814f..ce041dface 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -951,6 +951,11 @@  static Chardev *chardev_new(const char *id, const char *typename,

     assert(g_str_has_prefix(typename, "chardev-"));

+    if (id && object_resolve_path_component(get_chardevs_root(), id)) {
+        error_setg(errp, "Chardev '%s' already exists", id);
+        return NULL;
+    }
+
     obj = object_new(typename);
     chr = CHARDEV(obj);
     chr->label = g_strdup(id);
@@ -969,11 +974,7 @@  static Chardev *chardev_new(const char *id, const char *typename,
     }

     if (id) {
-        object_property_try_add_child(get_chardevs_root(), id, obj,
-                                      &local_err);
-        if (local_err) {
-            goto end;
-        }
+        object_property_add_child(get_chardevs_root(), id, obj);
         object_unref(obj);
     }