From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c8rWb-0002py-KC for qemu-devel@nongnu.org; Mon, 21 Nov 2016 11:33:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c8rWY-0007pr-E3 for qemu-devel@nongnu.org; Mon, 21 Nov 2016 11:32:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8532) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c8rWY-0007pX-3l for qemu-devel@nongnu.org; Mon, 21 Nov 2016 11:32:54 -0500 References: <147954362297.28064.5118492606031513925.stgit@bahia> From: Eric Blake Message-ID: <652a5dd2-a3d4-df78-9d49-243ef744ac90@redhat.com> Date: Mon, 21 Nov 2016 10:32:50 -0600 MIME-Version: 1.0 In-Reply-To: <147954362297.28064.5118492606031513925.stgit@bahia> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7teITmxaklvelRIRXciueesSRuI8jC7So" Subject: Re: [Qemu-devel] [PATCH] qapi: add explicit null to string input and output visitors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz , qemu-devel@nongnu.org Cc: Michael Roth , Markus Armbruster , David Gibson This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7teITmxaklvelRIRXciueesSRuI8jC7So From: Eric Blake To: Greg Kurz , qemu-devel@nongnu.org Cc: Michael Roth , Markus Armbruster , David Gibson Message-ID: <652a5dd2-a3d4-df78-9d49-243ef744ac90@redhat.com> Subject: Re: [Qemu-devel] [PATCH] qapi: add explicit null to string input and output visitors References: <147954362297.28064.5118492606031513925.stgit@bahia> In-Reply-To: <147954362297.28064.5118492606031513925.stgit@bahia> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/19/2016 02:28 AM, Greg Kurz wrote: > This may be used for deprecated object properties that are kept for > backwards compatibility. >=20 > Signed-off-by: Greg Kurz > --- >=20 > This is enough to fix David's patch: >=20 > [RFCv2 10/12] pseries: Move CPU compatibility property to machine Do we need both input and output visitors, or is the problem only caused on an output visit? >=20 > Messag-Id: <1479248275-18889-11-git-send-email-david@gibson.dropbear.id= =2Eau> >=20 > qapi/string-input-visitor.c | 5 +++++ > qapi/string-output-visitor.c | 14 ++++++++++++++ > 2 files changed, 19 insertions(+) >=20 > diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c > index 8dfa5612522b..4a378d7b67e6 100644 > --- a/qapi/string-input-visitor.c > +++ b/qapi/string-input-visitor.c > @@ -314,6 +314,10 @@ static void parse_type_number(Visitor *v, const ch= ar *name, double *obj, > *obj =3D val; > } > =20 > +static void parse_type_null(Visitor *v, const char *name, Error **errp= ) > +{ > +} In particular, this always succeeds, even though we don't have a symmetric way to guarantee that the user can specifically request NULL input (the qobject visitor checks for the JSON keyword NULL, but that's different from string parsing), so I'm a bit worried that it is not doing what we want. If you omit this hunk, does the problem with David's patch still go away with just the output visitor change? > + > static void parse_optional(Visitor *v, const char *name, bool *present= ) > { > StringInputVisitor *siv =3D to_siv(v); > @@ -348,6 +352,7 @@ Visitor *string_input_visitor_new(const char *str) > v->visitor.type_bool =3D parse_type_bool; > v->visitor.type_str =3D parse_type_str; > v->visitor.type_number =3D parse_type_number; > + v->visitor.type_null =3D parse_type_null; > v->visitor.start_list =3D start_list; > v->visitor.next_list =3D next_list; > v->visitor.end_list =3D end_list; > diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.= c > index 94ac8211d144..5ec5352ca87c 100644 > --- a/qapi/string-output-visitor.c > +++ b/qapi/string-output-visitor.c > @@ -266,6 +266,19 @@ static void print_type_number(Visitor *v, const ch= ar *name, double *obj, > string_output_set(sov, g_strdup_printf("%f", *obj)); > } > =20 > +static void print_type_null(Visitor *v, const char *name, Error **errp= ) > +{ > + StringOutputVisitor *sov =3D to_sov(v); > + char *out; > + > + if (sov->human) { > + out =3D g_strdup(""); > + } else { > + out =3D g_strdup(""); > + } > + string_output_set(sov, out); > +} > + > static void > start_list(Visitor *v, const char *name, GenericList **list, size_t si= ze, > Error **errp) > @@ -351,6 +364,7 @@ Visitor *string_output_visitor_new(bool human, char= **result) > v->visitor.type_bool =3D print_type_bool; > v->visitor.type_str =3D print_type_str; > v->visitor.type_number =3D print_type_number; > + v->visitor.type_null =3D print_type_null; > v->visitor.start_list =3D start_list; > v->visitor.next_list =3D next_list; > v->visitor.end_list =3D end_list; >=20 >=20 >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --7teITmxaklvelRIRXciueesSRuI8jC7So Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJYMyGyAAoJEKeha0olJ0NqQ1MH/j1NJqy3+EoiocM6oL5eU4Sw wIdciKTtz9XN/n1KUKsDuYUaIhxMst/r84Lrhw5p8PgFIxjNOGjxrn1NokNw8Ood uvwar8fX8NbvV+//7NL68fY3/uk0zbx6pYTXs/0YQa8FH+oxYiHM2dAh9vrPVtqu KglsiodMoZMhgmfLPHU3uYlaxC+BikOidYYGK7HuFZAHZSzEkPiLdrr9xxAEdWlk j3Z6/bdjf4kHXTcp2ag3rgUXfeIBjAZ30MYor5ZDEMSJUcTEcS99Ebs7hBJaK14O KbFd2289V55t/0WJ4f1ruflFfksBY/Lpidqrl/F5PaKxdLtDbxJUo1InktOqI+A= =5diP -----END PGP SIGNATURE----- --7teITmxaklvelRIRXciueesSRuI8jC7So--