[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/21] char: remove qemu_chardev_add
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 08/21] char: remove qemu_chardev_add |
Date: |
Mon, 27 Feb 2017 17:41:49 +0400 |
qemu_chardev_new() now uses object_new_with_props() with /chardevs
parent container. It will fail to insert the object if the same "id"
already exists. "chardevs" list usage has been removed in previous
commits.
Signed-off-by: Marc-André Lureau <address@hidden>
---
chardev/char.c | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/chardev/char.c b/chardev/char.c
index 82f3c939ba..b3622be3f4 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -805,26 +805,6 @@ static const ChardevClass *char_get_class(const char
*driver, Error **errp)
return cc;
}
-static Chardev *qemu_chardev_add(const char *id, const char *typename,
- ChardevBackend *backend, Error **errp)
-{
- Chardev *chr;
-
- chr = qemu_chr_find(id);
- if (chr) {
- error_setg(errp, "Chardev '%s' already exists", id);
- return NULL;
- }
-
- chr = qemu_chardev_new(id, typename, backend, errp);
- if (!chr) {
- return NULL;
- }
-
- QTAILQ_INSERT_TAIL(&chardevs, chr, next);
- return chr;
-}
-
static const struct ChardevAlias {
const char *typename;
const char *alias;
@@ -941,9 +921,10 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
backend->u.null.data = ccom; /* Any ChardevCommon member would work */
}
- chr = qemu_chardev_add(bid ? bid : id,
+ chr = qemu_chardev_new(bid ? bid : id,
object_class_get_name(OBJECT_CLASS(cc)),
backend, errp);
+
if (chr == NULL) {
goto out;
}
@@ -955,7 +936,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
backend->type = CHARDEV_BACKEND_KIND_MUX;
backend->u.mux.data = g_new0(ChardevMux, 1);
backend->u.mux.data->chardev = g_strdup(bid);
- mux = qemu_chardev_add(id, TYPE_CHARDEV_MUX, backend, errp);
+ mux = qemu_chardev_new(id, TYPE_CHARDEV_MUX, backend, errp);
if (mux == NULL) {
object_unparent(OBJECT(chr));
chr = NULL;
@@ -1296,7 +1277,7 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
return NULL;
}
- chr = qemu_chardev_add(id, object_class_get_name(OBJECT_CLASS(cc)),
+ chr = qemu_chardev_new(id, object_class_get_name(OBJECT_CLASS(cc)),
backend, errp);
if (!chr) {
return NULL;
--
2.12.0.rc2.3.gc93709801
- [Qemu-devel] [PATCH v2 01/21] char: remove qemu_chr_be_generic_open, (continued)
- [Qemu-devel] [PATCH v2 01/21] char: remove qemu_chr_be_generic_open, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 02/21] mux: simplfy muxes_realize_done, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 03/21] xen: use a better chardev type check, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 04/21] container: don't leak container reference, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 06/21] vl: add todo note about root container cleanup, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 05/21] char: add a /chardevs container, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 07/21] char: use /chardevs container instead of chardevs list, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 08/21] char: remove qemu_chardev_add,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 09/21] char: remove chardevs list, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 11/21] char-socket: introduce update_disconnected_filename(), Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 10/21] char: useless NULL check, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 12/21] char-socket: update local address after listen, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 13/21] char-socket: add 'addr' property, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 14/21] char-socket: add 'connected' property, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 15/21] char-udp: flush as much buffer as possible, Marc-André Lureau, 2017/02/27
- [Qemu-devel] [PATCH v2 16/21] tests: add alias check in /char/ringbuf, Marc-André Lureau, 2017/02/27