[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 6/9] chardev/char.c: Move object_property_try_add_child out of
From: |
marcandre . lureau |
Subject: |
[PULL v2 6/9] chardev/char.c: Move object_property_try_add_child out of chardev_new |
Date: |
Thu, 1 Apr 2021 15:55:29 +0400 |
From: Lukas Straub <lukasstraub2@web.de>
Move object_property_try_add_child out of chardev_new into it's
callers. This is a preparation for the next patches to fix yank
with the chardev-change case.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Li Zhang <li.zhang@cloud.ionos.com>
Message-Id:
<b2a5092ec681737bc3a21ea16f3c00848b277521.1617127849.git.lukasstraub2@web.de>
---
chardev/char.c | 42 ++++++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/chardev/char.c b/chardev/char.c
index 140d6d9d36..48f321b3e1 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -975,7 +975,9 @@ static Chardev *chardev_new(const char *id, const char
*typename,
qemu_char_open(chr, backend, &be_opened, &local_err);
if (local_err) {
- goto end;
+ error_propagate(errp, local_err);
+ object_unref(obj);
+ return NULL;
}
if (!chr->filename) {
@@ -985,22 +987,6 @@ static Chardev *chardev_new(const char *id, const char
*typename,
qemu_chr_be_event(chr, CHR_EVENT_OPENED);
}
- if (id) {
- object_property_try_add_child(get_chardevs_root(), id, obj,
- &local_err);
- if (local_err) {
- goto end;
- }
- object_unref(obj);
- }
-
-end:
- if (local_err) {
- error_propagate(errp, local_err);
- object_unref(obj);
- return NULL;
- }
-
return chr;
}
@@ -1009,6 +995,7 @@ Chardev *qemu_chardev_new(const char *id, const char
*typename,
GMainContext *gcontext,
Error **errp)
{
+ Chardev *chr;
g_autofree char *genid = NULL;
if (!id) {
@@ -1016,7 +1003,19 @@ Chardev *qemu_chardev_new(const char *id, const char
*typename,
id = genid;
}
- return chardev_new(id, typename, backend, gcontext, errp);
+ chr = chardev_new(id, typename, backend, gcontext, errp);
+ if (!chr) {
+ return NULL;
+ }
+
+ if (!object_property_try_add_child(get_chardevs_root(), id, OBJECT(chr),
+ errp)) {
+ object_unref(OBJECT(chr));
+ return NULL;
+ }
+ object_unref(OBJECT(chr));
+
+ return chr;
}
ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
@@ -1037,6 +1036,13 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
return NULL;
}
+ if (!object_property_try_add_child(get_chardevs_root(), id, OBJECT(chr),
+ errp)) {
+ object_unref(OBJECT(chr));
+ return NULL;
+ }
+ object_unref(OBJECT(chr));
+
ret = g_new0(ChardevReturn, 1);
if (CHARDEV_IS_PTY(chr)) {
ret->pty = g_strdup(chr->filename + 4);
--
2.29.0
- [PULL v2 0/9] For 6.0 patches, marcandre . lureau, 2021/04/01
- [PULL v2 1/9] util: fix use-after-free in module_load_one, marcandre . lureau, 2021/04/01
- [PULL v2 2/9] dbus-vmstate: Increase the size of input stream buffer used during load, marcandre . lureau, 2021/04/01
- [PULL v2 3/9] docs: simplify each section title, marcandre . lureau, 2021/04/01
- [PULL v2 4/9] yank: Remove dependency on qiochannel, marcandre . lureau, 2021/04/01
- [PULL v2 5/9] yank: Always link full yank code, marcandre . lureau, 2021/04/01
- [PULL v2 6/9] chardev/char.c: Move object_property_try_add_child out of chardev_new,
marcandre . lureau <=
- [PULL v2 7/9] chardev/char.c: Always pass id to chardev_new, marcandre . lureau, 2021/04/01
- [PULL v2 8/9] chardev: Fix yank with the chardev-change case, marcandre . lureau, 2021/04/01
- [PULL v2 9/9] tests: Add tests for yank with the chardev-change case, marcandre . lureau, 2021/04/01
- Re: [PULL v2 0/9] For 6.0 patches, Peter Maydell, 2021/04/01