From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsYrW-0003rA-7Y for qemu-devel@nongnu.org; Fri, 28 Jun 2013 09:37:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsYrU-0003UR-SN for qemu-devel@nongnu.org; Fri, 28 Jun 2013 09:37:18 -0400 Message-ID: <51CD9188.8060203@redhat.com> Date: Fri, 28 Jun 2013 07:37:12 -0600 From: Eric Blake MIME-Version: 1.0 References: <1372342930-28684-1-git-send-email-armbru@redhat.com> <1372342930-28684-5-git-send-email-armbru@redhat.com> In-Reply-To: <1372342930-28684-5-git-send-email-armbru@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="----enig2QTVVGLXLEPTAPCJNTPSX" Subject: Re: [Qemu-devel] [PATCH 4/4] qapi: Rename ChardevBackend member "memory" to "ringbuf" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: aliguori@us.ibm.com, lilei@linux.vnet.ibm.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org, lcapitulino@redhat.com, kraxel@redhat.com, Amos Kong This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2QTVVGLXLEPTAPCJNTPSX Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06/27/2013 08:22 AM, Markus Armbruster wrote: > Commit 1da48c6 called the new member "memory" after commit 3949e59 > standardized "ringbuf". Rename for consistency. >=20 > However, member name "memory" is visible in QMP since 1.5. It's > undocumented just like the driver name. Keep it working anyway. >=20 > Cc: qemu-stable@nongnu.org > Signed-off-by: Markus Armbruster > --- > qapi-schema.json | 6 ++++-- > qemu-char.c | 11 ++++++----- > 2 files changed, 10 insertions(+), 7 deletions(-) >=20 > diff --git a/qapi-schema.json b/qapi-schema.json > index 6445da6..b3df8a5 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -3277,9 +3277,9 @@ > ## > # @ChardevRingbuf: > # > -# Configuration info for memory chardevs > +# Configuration info for ring buffer chardevs. > # > -# @size: #optional Ringbuffer size, must be power of two, default is 6= 5536 > +# @size: #optional ring buffer size, must be power of two, default is = 65536 > # > # Since: 1.5 > ## > @@ -3310,6 +3310,8 @@ > 'spicevmc' : 'ChardevSpiceChann= el', > 'spiceport' : 'ChardevSpicePort= ', > 'vc' : 'ChardevVC', > + 'ringbuf': 'ChardevRingbuf', > + # next one is just for compatib= ility > 'memory' : 'ChardevRingbuf' } }= Does JSON allow comments in the middle of content? Is this going to screw up Amos' work on introspection? You may need to instead have a comment before the open '{' stating that 'memory' is an alias within the union for back-compat reasons. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org ------enig2QTVVGLXLEPTAPCJNTPSX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJRzZGIAAoJEKeha0olJ0Nq6J0H/3n2U01KkHcrW4rRD/8rPP+w RcbliA3wVScsFImTu8egAsYgqTr+iaLvJ7RXC/uMLSBpn8SH6r5Dh6vMDs6HQ1Dy sTZuB/pbyGvrRwTl7R8dQyq/hRPWqq9PIIX6HA1sAWPqZK7BRPRnPC2vd1KD4KH6 imlNow0zFmQB7xMqcv/EOOIcbDcuUiDMTuRnc6gp3SVZ0MdQ1id0FZzqPrVEBj8m EeTzyaVLT55qcWNU/bZ2P3xSVwMytgWyNUcLtCt0N+bmUO9o/aWqcuW3APnkvwDn POHJG88z+NG7v2xHn4HDj9gjY+kiLkVNam6T+LK+QKWrq1v7i5V8/vR3U03HY9I= =PYcp -----END PGP SIGNATURE----- ------enig2QTVVGLXLEPTAPCJNTPSX--