Received: from eggs.gnu.org ([2001:4830:134:3::10]:39107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLsRh-0003OB-5z for qemu-devel@nongnu.org; Wed, 20 Jan 2016 08:05:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLsRd-0007Uo-No for qemu-devel@nongnu.org; Wed, 20 Jan 2016 08:05:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLsRd-0007UP-GB for qemu-devel@nongnu.org; Wed, 20 Jan 2016 08:05:05 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 177A33824FD for ; Wed, 20 Jan 2016 13:05:05 +0000 (UTC) From: Markus Armbruster References: <1453219845-30939-1-git-send-email-eblake@redhat.com> <1453219845-30939-5-git-send-email-eblake@redhat.com> Date: Wed, 20 Jan 2016 14:05:02 +0100 In-Reply-To: <1453219845-30939-5-git-send-email-eblake@redhat.com> (Eric Blake's message of "Tue, 19 Jan 2016 09:10:12 -0700") Message-ID: <8760yoz9j5.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v9 04/37] hmp: Improve use of qapi visitor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: marcandre.lureau@redhat.com, qemu-devel@nongnu.org, Luiz Capitulino Eric Blake writes: > Cache the visitor in a local variable instead of repeatedly > calling the accessor. Pass NULL for the visit_start_struct() > object (which matches the fact that we were already passing 0 > for the size argument, because we aren't using the visit to > allocate a qapi struct). Two separate things. Doing them both in a single patch is okay because the resulting patch is short enough to be easily reviewable anyway. > Signed-off-by: Eric Blake > Reviewed-by: Marc-Andr=C3=A9 Lureau > > --- > v9: no change > v8: no change > v7: place earlier in series, drop attempts to provide a 'kind' string, > drop bogus avoidance of qmp_object_del() on error > v6: new patch, split from RFC on v5 7/46 > --- > hmp.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/hmp.c b/hmp.c > index 54f2620..6d67f9b 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -1656,9 +1656,9 @@ void hmp_object_add(Monitor *mon, const QDict *qdic= t) > QemuOpts *opts; > char *type =3D NULL; > char *id =3D NULL; > - void *dummy =3D NULL; > OptsVisitor *ov; > QDict *pdict; > + Visitor *v; > > opts =3D qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err); > if (err) { > @@ -1667,28 +1667,29 @@ void hmp_object_add(Monitor *mon, const QDict *qd= ict) > > ov =3D opts_visitor_new(opts); > pdict =3D qdict_clone_shallow(qdict); > + v =3D opts_get_visitor(ov); > > - visit_start_struct(opts_get_visitor(ov), &dummy, NULL, NULL, 0, &err= ); > + visit_start_struct(v, NULL, NULL, NULL, 0, &err); The only callers that can allocate are the generated visit_type_FOO() for struct or union FOO. The non-allocating callers mostly look like visit_start_struct(v, NULL, NULL, NULL, 0, &err); Some pass a non-null @kind (third argument), but that's rubbish anyway (see PATCH 17). Some pass a non-null @name (fourth argument). QMP visitors need that, others don't care. This caller is the only one that passes a non-null @obj (second argument). Makes visitors capable of allocating allocate @size bytes (fifth argument). Except opts-visitor allocates one byte instead of zero to avoid a null object, for unclear reasons. Whatever gets allocated we free (see last hunk) without using. The patch avoids this pointless allocation. Good. Suggest to explain this more clearly in the commit message: Pass NULL for the visit_start_struct() parameter @obj to suppress unwanted allocation, like we do elsewhere. > if (err) { > goto out_clean; > } > > qdict_del(pdict, "qom-type"); > - visit_type_str(opts_get_visitor(ov), &type, "qom-type", &err); > + visit_type_str(v, &type, "qom-type", &err); > if (err) { > goto out_end; > } > > qdict_del(pdict, "id"); > - visit_type_str(opts_get_visitor(ov), &id, "id", &err); > + visit_type_str(v, &id, "id", &err); > if (err) { > goto out_end; > } > > - object_add(type, id, pdict, opts_get_visitor(ov), &err); > + object_add(type, id, pdict, v, &err); > > out_end: > - visit_end_struct(opts_get_visitor(ov), &err_end); > + visit_end_struct(v, &err_end); > if (!err && err_end) { > qmp_object_del(id, NULL); > } > @@ -1700,7 +1701,6 @@ out_clean: > qemu_opts_del(opts); > g_free(id); > g_free(type); > - g_free(dummy); > > out: > hmp_handle_error(mon, &err);