From patchwork Fri Mar 26 07:48:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1458691 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=AGtjUAfX; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F6DdV0Fn1z9sRK for ; Fri, 26 Mar 2021 18:49:34 +1100 (AEDT) Received: from localhost ([::1]:41116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPhDo-0002eR-0L for incoming@patchwork.ozlabs.org; Fri, 26 Mar 2021 03:49:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPhDF-0002cR-1Z for qemu-devel@nongnu.org; Fri, 26 Mar 2021 03:48:57 -0400 Received: from mout.web.de ([212.227.15.3]:39735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPhD8-0002WP-Rj for qemu-devel@nongnu.org; Fri, 26 Mar 2021 03:48:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1616744926; bh=dn5JnxLD03A1MjGbpLQHn5ts0L4MXedl8j8wX6j74LA=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=AGtjUAfX/PGKmfY/Kyrmi409LKaHufQUUvcdP9iRm6SGqNEluhL8/4HTtFKHiPu3l kCju/nHdHQc7PJMEEYneefMFUXfvAs0lqESNg80Wd/4O5hma5fyM7A/LxMUduO5fMn D1vh8qPWuK9FnIJlttWcTHB8/cuPSzNQ4x7biSmE= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from gecko.fritz.box ([89.247.255.242]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MeUbo-1lxeyv41hs-00aXha; Fri, 26 Mar 2021 08:48:46 +0100 Date: Fri, 26 Mar 2021 08:48:44 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH v4 1/4] chardev/char.c: Move object_property_try_add_child out of chardev_new Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:AU2Rgykes3wSvIiBmIVH62grL5Wq+sRy75PwqFtai42H82ywmzA IMVhHsWvGJD2jj7eo/IQo/9GA7wIxfsWjIztVD0zhblOeA+qs47iLeL18Qc/nSNYUlBpCX3 +PPb5JfxsxFsp/qn7E66WG7z3Eq51nhH8unbS6klH/sSBi+ycKGhbAkGF8U4kEjBcCU0pbl NaPOPIJRKEotvd5EMj2Uw== X-UI-Out-Filterresults: notjunk:1;V03:K0:SkUsXfJL4k0=:YHzGQgB0dlUDlHQDn1kZCn ZRtsRr46QCHXq6VmGYapiMC5XwRd7ZArLYdiC2/pnaS6+dywRtA3mww7MWdnWYAzW3za6Io1z KI+yNzdB4w3ALMSJiBgb0Z3X5tPVHNMjHwkIbiCxfOy5KFbcK6ucWdOz00M5EuUxesINZvJzu CSevNahWJd6grlWa3R36Mih3okPXQpjuSePdPCcz3BNkDMYf39t2An/uHt0dmpGa4sGwuUs0r u6fGyR6YYD/MnpD50683TnTA0ZhfNma69Tsi+pi2+ekNgCN1qCSW8un04S8m/KYcEMDP58o/I 341dOoyeYd1N1IlvLWp30voeyCehZMgQCQdByq/DY93KBW3QiB/HPhk0I1vAa4ySedbvT7CW5 ScgNx7kTj+kb7y6lY7U4eIr/cUQO4r5NndGRCfCWuoAYgvDx0a28WpNKPvwwiu/Neftlharbu +YR/yFyZSNs02vEuHtOEHd2rgj/FuxIzYj5t6d56O/z5CIyJrOslwwT1UDUgdhaPcmSsIHFqg 0uiQ/5zfdkdscmwXgYOoUjjGght5BJ3KCYsgMfQ8jyklWvqQhZoIw0adRYQhLpWeF0IaTrVqM FMXotRHNkmjihRYvzS+QHPp57FfRgBenBtWOkHOzikAGQBzc5hTOrPREGpW7i+IQF2588R7rZ 6ZKlXF+PeXWrbFJZdUzkCmUvqQMFoG2Jaolz5mK8KYQHlGYXtuzOc3RRGwhe0dJEYJ4ebiyOr youWNY4mKkWn1hTLUz/TQqazCOJ3h7GXOfDkJvJkfKnKOYATSgxpObW6+qR9PsCFan0ndA66X 9ZcZClFQGZcPg9tfFkecodN2xKKWwIfAJw62JID2o8uByM2xOBf7UF2xsSfA2p71pVfws0b8D Y6Ef543vQr9x/qwJFgO+4W9w5WUl2aFRJsJfa1cj+gHitCUHG2b19d5vPAlvb3nUzyFyXXGER 1NjWVKDlSVFYC85KROTgpUiGYbrE6v+cTI0XoceZQuktQSwFzBNXZS9YVtI7Xr58IHaldwbRy XTpGXTTZwwkxM5zpp3why/ao4LAdUnuCXCGlpxfXlKVlOD0UrBQuUye/3d1O+UVEYkFegXGLG eQzGj4aCjU6Ksh3AMSGOB85tPLyq7jjR7b71FAgBDxxJqGkIxHwIfOkIhx0KqBTUlJ78ohDlL Kr13g+jvUTYxMN3qAxJvPNEat8PsH3oE8KwzIgmWnz7lfd7lqh3BfcvDr9/ldKVgX2OB4= Received-SPF: pass client-ip=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Marc-Andre Lureau , Thomas Huth , Li Zhang , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Marc-André Lureau Tested-by: Li Zhang --- chardev/char.c | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) -- 2.30.2 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);