From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKrfc-0008Hq-ER for Qemu-devel@nongnu.org; Tue, 04 Mar 2014 10:54:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKrfV-0001Fb-VN for Qemu-devel@nongnu.org; Tue, 04 Mar 2014 10:54:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKrfV-0001FX-Mj for Qemu-devel@nongnu.org; Tue, 04 Mar 2014 10:54:09 -0500 Message-ID: <5315F715.9030209@redhat.com> Date: Tue, 04 Mar 2014 08:53:57 -0700 From: Eric Blake MIME-Version: 1.0 References: <5310489A.4060501@cisco.com> <53105EB0.3060702@redhat.com> <5315EEFE.6060605@cisco.com> <5315EFA6.1010600@cisco.com> In-Reply-To: <5315EFA6.1010600@cisco.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8SBGoBmX0qewEEPxDKf4q8uatJRpxEFo3" Subject: Re: [Qemu-devel] Contribution - L2TPv3 transport List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Anton Ivanov (antivano)" , Paolo Bonzini Cc: "Qemu-devel@nongnu.org" , Stefan Hajnoczi This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --8SBGoBmX0qewEEPxDKf4q8uatJRpxEFo3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 03/04/2014 08:22 AM, Anton Ivanov (antivano) wrote: > Apologies, missed to diff the json definitions. >=20 > Attached. >=20 Missing a commit message and a Signed-off-by line, so it can't be applied as-is. Also, we prefer inline patches (as sent by 'git send-email') over attached patches; I suggest using 'git send-email' to first send the patches to yourself to make sure your settings are correct= =2E > diff --git a/qapi-schema.json b/qapi-schema.json > index 83fa485..56eac6d 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -2940,6 +2940,62 @@ > '*localaddr': 'str', > '*udp': 'str' } } > =20 > +# @NetdevL2TPv3Options > +# > +# Connect the VLAN to Ethernet over L2TPv3 Static tunnel > +# > +# @ipv6: #bool, use ipv6=20 > +# This should be: # @ipv6: #optional true to use ipv6, default false That is, we have a marking '#optional', but do not have a marking '#bool' (you can read the actual definition below to learn that 'ipv6' is a bool type). Also, it makes it easier if you document options in the same order as they appear in the struct below (there, you have 'fd' first). > +# @udp: #bool use the udp version of the L2TPv3 encapsulation Again, #optional, not #bool, and mention the default value > +# > +# @cookie64 : #use 64 bit cookies #optional > +# > +# @offset : #extra offset #optional > +# > +# @counter : #have sequence counter #optional > +# > +# @fd: #optional file descriptor of an already opened socket This doesn't seem to take into account my earlier comments - is the goal to allow opening both files from the file system and the magic string '/dev/fdset/...' supported by use of 'add-fd'? > +# > +# @src: #source address Should be: # @src: source address The only use of # inside the docs has been for the tag '#optional' > +# > +# @srcport: #source port - mandatory for udp, optional for ip > +# > +# @dst: #destination address > +# > +# @dstport: #destination port - mandatory for udp, optional for ip > +# > +# @txcookie: #optional 32 or 64 bit tx cookie for the tunnel=20 > +# > +# @rxcookie: #optional 32 or 64 bit rx cookie for the tunnel > +# > +# @txsession: #tx 32 bit session > +# > +# @rxsession: #rx 32 bit session - if unset value for txsession is use= d Should be: # @rxsession: #optional rx 32 bit session, defaults to @txsession > +# > +# > +# Since 1.2 Should be: Since 2.0 > +## > +## > +{ 'type': 'NetdevL2TPv3Options', > + 'data': { > + '*fd': 'str', > + 'src': 'str',=20 > + 'dst': 'str',=20 > + '*srcport': 'str',=20 > + '*dstport': 'str',=20 > + '*ipv6': 'bool',=20 > + '*udp': 'bool',=20 > + '*cookie64': 'bool',=20 > + '*counter': 'bool',=20 > + '*txcookie': 'uint64', > + '*rxcookie': 'uint64', > + 'txsession': 'uint32', > + '*rxsession': 'uint32', > + '*offset': 'uint32'=20 > + Why the blank line? > +} } > + > +## > ## > # @NetdevVdeOptions > # > @@ -3014,13 +3070,16 @@ > # A discriminated record of network device traits. > # > # Since 1.2 > -## > +# > +# Added in 2.0 - l2tpv3=20 > +# > { 'union': 'NetClientOptions', > 'data': { > 'none': 'NetdevNoneOptions', > 'nic': 'NetLegacyNicOptions', > 'user': 'NetdevUserOptions', > 'tap': 'NetdevTapOptions', > + 'l2tpv3': 'NetdevL2TPv3Options', > 'socket': 'NetdevSocketOptions', > 'vde': 'NetdevVdeOptions', > 'dump': 'NetdevDumpOptions', >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --8SBGoBmX0qewEEPxDKf4q8uatJRpxEFo3 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 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTFfcVAAoJEKeha0olJ0NqTGoH/0IzuU2lLsi9bV1mF2B3jI7F rTzWNCkXBigwMbyVcxUmtIm2EL8V8cqfbIDIUjIOeELwKE/VefeyT5a3DEXI4bKW JH9w3Z0cC6x/KKJ35lgtbpCkPUvou6qXEu+0tuw7GtJaxQMt6xWuvgAtghHlSX9W VoszJgYwVQF3Oopstl/cu7ulkRSPwVpwiE41kv5Q2GuG7IQV9P/Z8LhYDzFB87VK 5b64zQKfWqhfInBpswtedPC6J/3MUCAoN2bvPFWcWr+4lk8jIEoFCjdHO+BYyRGu OO5EwqVQB6Fof7+3J4GPPVfbSu/9DrlCvPvwV6cGLBKXRuMFFefA9b2euPsjMzs= =X77L -----END PGP SIGNATURE----- --8SBGoBmX0qewEEPxDKf4q8uatJRpxEFo3--