From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7E3FC433DB for ; Mon, 22 Mar 2021 08:45:50 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7516561970 for ; Mon, 22 Mar 2021 08:45:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7516561970 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOGC5-0003Ux-Hc for qemu-devel@archiver.kernel.org; Mon, 22 Mar 2021 04:45:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOG9T-0002ZX-OB for qemu-devel@nongnu.org; Mon, 22 Mar 2021 04:43:07 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:38490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOG9K-00038O-7H for qemu-devel@nongnu.org; Mon, 22 Mar 2021 04:43:05 -0400 Received: by mail-ej1-x635.google.com with SMTP id r12so19837727ejr.5 for ; Mon, 22 Mar 2021 01:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=5LIb+nSyUMRLCe0UYPFicVum6PzgaKbR6qIbqZPwRQg=; b=VLRcuPkHKWgSm/XL7jzGtl/x/Bbi7pvc1wafbXpH6iV1NayQHKQhg8bNDcMOki4MIB w8oOrzXkxB8UPDNW7UPqDu49Xt4KDfksnZ/HqGmUNxA7gUkbvtgMrOXiPorW3GRaMHCg +fmXbTdJcgHo7JPBNQxV+Dy9tstSQ8BLauqw3q165qOhhkeeGxNFJaap2VmTdtIAW+aY 22RGI8J8qXXe5gayZ6sBmn1D6VF2/iR1QW8CCEk88NjwDPS7FUFznCGojJP6zRUdQEoa 6jybxvMJFOHURdEt2tyESp6rBvOJi7CaIuyeQPcibi/fv/ogUlUHTChmnQgbp0+Muent obdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5LIb+nSyUMRLCe0UYPFicVum6PzgaKbR6qIbqZPwRQg=; b=OGKhSHvClr6PXm23Kzd9qKAi2exN/aNnLQc0DfJXrueH9IrTibQVNnbJO4Txae6VPV PEnFgGgXkC1vT4/F2CIc4kWXG7D2CLOlKGlyPl8t0HX/NXL61PS0Unm/yW4pp4RhLIL/ eHnrCxE0YyF6tevqPHRFV+KA4hp+5DStww/aqdS2auL/83Ebv2a+r27VH185N7hr9bnB xyFKqIF7R6fhZULe+6djXQ0ZQ8JR/TzvyhcCEYkNiHM7YieesTzXceQGxBbO+yIpZ52i sJKnMnAY0cLPfkFohvYORdBmMVSUNYIHz1pJX4LPbzQJUPdYur3DzhA2+n+eTWS27lkx V+6A== X-Gm-Message-State: AOAM531XqH4YKv2gMRXFbhegzHjeG+EPPvGXJSpNijeU3PDZ1dR7ZRkI rUXb/tpgt5Mx881CwN8/mUfevdByWI0wkYZ2wPs= X-Google-Smtp-Source: ABdhPJx23axXR7ptg7+Wgfz5RiSwx0z4pYzUJK+bKtjUTD2gAMLx8Ukupc//hWXS5nYxBcN0lm8TVH2nvJVJK76Nrms= X-Received: by 2002:a17:906:a1c8:: with SMTP id bx8mr17642817ejb.381.1616402576610; Mon, 22 Mar 2021 01:42:56 -0700 (PDT) MIME-Version: 1.0 References: <4d61f31f4c2ba1e768d91b2d8f946ea49b3a36fe.1616368879.git.lukasstraub2@web.de> In-Reply-To: <4d61f31f4c2ba1e768d91b2d8f946ea49b3a36fe.1616368879.git.lukasstraub2@web.de> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Mon, 22 Mar 2021 12:42:45 +0400 Message-ID: Subject: Re: [PATCH 3/5] chardev/char.c: Move object_property_try_add_child out of chardev_new To: Lukas Straub Content-Type: multipart/alternative; boundary="00000000000064982a05be1c0dc5" Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=marcandre.lureau@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 , Paolo Bonzini , Thomas Huth , Li Zhang , qemu-devel Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --00000000000064982a05be1c0dc5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi On Mon, Mar 22, 2021 at 3:31 AM Lukas Straub wrote: > 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 > --- > chardev/char.c | 42 ++++++++++++++++++++++++------------------ > 1 file changed, 24 insertions(+), 18 deletions(-) > > diff --git a/chardev/char.c b/chardev/char.c > index 97cafd6849..1584865027 100644 > --- a/chardev/char.c > +++ b/chardev/char.c > @@ -972,7 +972,9 @@ static Chardev *chardev_new(const char *id, const cha= r > *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) { > @@ -982,22 +984,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; > } > > @@ -1006,6 +992,7 @@ Chardev *qemu_chardev_new(const char *id, const char > *typename, > GMainContext *gcontext, > Error **errp) > { > + Chardev *chr; > g_autofree char *genid =3D NULL; > > if (!id) { > @@ -1013,7 +1000,19 @@ Chardev *qemu_chardev_new(const char *id, const > char *typename, > id =3D genid; > } > > - return chardev_new(id, typename, backend, gcontext, errp); > + chr =3D chardev_new(id, typename, backend, gcontext, errp); > You could have added a "register" argument to avoid duplication of code imho. But since there are only 2 callers, I guess it's fine to inline it. Reviewed-by: Marc-Andr=C3=A9 Lureau + 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, > @@ -1034,6 +1033,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 =3D g_new0(ChardevReturn, 1); > if (CHARDEV_IS_PTY(chr)) { > ret->pty =3D g_strdup(chr->filename + 4); > -- > 2.30.2 > > --=20 Marc-Andr=C3=A9 Lureau --00000000000064982a05be1c0dc5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi

On Mon, Mar 22, 2021 at 3:31 AM Lukas Straub = <lukasstraub2@web.de> wrot= e:
Move object_p= roperty_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>
---
=C2=A0chardev/char.c | 42 ++++++++++++++++++++++++------------------
=C2=A01 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/chardev/char.c b/chardev/char.c
index 97cafd6849..1584865027 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -972,7 +972,9 @@ static Chardev *chardev_new(const char *id, const char = *typename,

=C2=A0 =C2=A0 =C2=A0qemu_char_open(chr, backend, &be_opened, &local= _err);
=C2=A0 =C2=A0 =C2=A0if (local_err) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 goto end;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 error_propagate(errp, local_err);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 object_unref(obj);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return NULL;
=C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0if (!chr->filename) {
@@ -982,22 +984,6 @@ static Chardev *chardev_new(const char *id, const char= *typename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0qemu_chr_be_event(chr, CHR_EVENT_OPENED);=
=C2=A0 =C2=A0 =C2=A0}

-=C2=A0 =C2=A0 if (id) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 object_property_try_add_child(get_chardevs_roo= t(), id, obj,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &local_err)= ;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (local_err) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 goto end;
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 }
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 object_unref(obj);
-=C2=A0 =C2=A0 }
-
-end:
-=C2=A0 =C2=A0 if (local_err) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 error_propagate(errp, local_err);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 object_unref(obj);
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 return NULL;
-=C2=A0 =C2=A0 }
-
=C2=A0 =C2=A0 =C2=A0return chr;
=C2=A0}

@@ -1006,6 +992,7 @@ Chardev *qemu_chardev_new(const char *id, const char *= typename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0GMainContext *gcontext,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0Error **errp)
=C2=A0{
+=C2=A0 =C2=A0 Chardev *chr;
=C2=A0 =C2=A0 =C2=A0g_autofree char *genid =3D NULL;

=C2=A0 =C2=A0 =C2=A0if (!id) {
@@ -1013,7 +1000,19 @@ Chardev *qemu_chardev_new(const char *id, const char= *typename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0id =3D genid;
=C2=A0 =C2=A0 =C2=A0}

-=C2=A0 =C2=A0 return chardev_new(id, typename, backend, gcontext, errp); +=C2=A0 =C2=A0 chr =3D chardev_new(id, typename, backend, gcontext, errp);<= br>

You could have added a "register&q= uot; argument to avoid duplication of code imho. But since there are only 2= callers, I guess it's fine to inline it.

Revi= ewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>

+=C2=A0 =C2=A0 if (!chr) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return NULL;
+=C2=A0 =C2=A0 }
+
+=C2=A0 =C2=A0 if (!object_property_try_add_child(get_chardevs_root(), id, = OBJECT(chr),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0errp)) {<= br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 object_unref(OBJECT(chr));
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return NULL;
+=C2=A0 =C2=A0 }
+=C2=A0 =C2=A0 object_unref(OBJECT(chr));
+
+=C2=A0 =C2=A0 return chr;
=C2=A0}

=C2=A0ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backen= d,
@@ -1034,6 +1033,13 @@ ChardevReturn *qmp_chardev_add(const char *id, Chard= evBackend *backend,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return NULL;
=C2=A0 =C2=A0 =C2=A0}

+=C2=A0 =C2=A0 if (!object_property_try_add_child(get_chardevs_root(), id, = OBJECT(chr),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0errp)) {<= br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 object_unref(OBJECT(chr));
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return NULL;
+=C2=A0 =C2=A0 }
+=C2=A0 =C2=A0 object_unref(OBJECT(chr));
+
=C2=A0 =C2=A0 =C2=A0ret =3D g_new0(ChardevReturn, 1);
=C2=A0 =C2=A0 =C2=A0if (CHARDEV_IS_PTY(chr)) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret->pty =3D g_strdup(chr->filename= + 4);
--
2.30.2



--
Marc-Andr=C3=A9 Lureau
--00000000000064982a05be1c0dc5--