[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 8/9] chardev/char.c: Check for duplicate id before creating ch
From: |
Lukas Straub |
Subject: |
[PATCH v6 8/9] chardev/char.c: Check for duplicate id before creating chardev |
Date: |
Fri, 31 Jul 2020 11:27:04 +0200 |
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(-)
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);
}
--
2.20.1
pgpq62bHhWeII.pgp
Description: OpenPGP digital signature
- [PATCH v6 0/9] Introduce 'yank' oob qmp command to recover from hanging qemu, Lukas Straub, 2020/07/31
- [PATCH v6 1/9] Introduce yank feature, Lukas Straub, 2020/07/31
- [PATCH v6 2/9] block/nbd.c: Add yank feature, Lukas Straub, 2020/07/31
- [PATCH v6 3/9] chardev/char-socket.c: Add yank feature, Lukas Straub, 2020/07/31
- [PATCH v6 4/9] migration: Add yank feature, Lukas Straub, 2020/07/31
- [PATCH v6 5/9] io/channel-tls.c: make qio_channel_tls_shutdown thread-safe, Lukas Straub, 2020/07/31
- [PATCH v6 6/9] io: Document thread-safety of qio_channel_shutdown, Lukas Straub, 2020/07/31
- [PATCH v6 7/9] MAINTAINERS: Add myself as maintainer for yank feature, Lukas Straub, 2020/07/31
- [PATCH v6 8/9] chardev/char.c: Check for duplicate id before creating chardev,
Lukas Straub <=
- [PATCH v6 9/9] tests/test-char.c: Wait for the chardev to connect in char_socket_client_dupid_test, Lukas Straub, 2020/07/31