On 19/03/14 12:39, Eric Blake wrote:
> On 03/19/2014 03:31 AM, anton.iva...@kot-begemot.co.uk wrote:
>> From: Anton Ivanov <antiv...@cisco.com>
>>
>> This tranport allows to connect a qemu nic to a static Ethernet
> s/tranport/transport/
Guilty as charged :)
>
>> over L2TPv3 tunnel. The transport supports all options present
>> in the linux kernel implementation. It allows qemu to connect
>> to any linux host running kernel 3.3+, most routers and network
>> devices as well as other qemu instances.
>>
>> Signed-off-by: Anton Ivanov <antiv...@cisco.com>
>> ---
>>
>> +++ b/qapi-schema.json
>> @@ -2941,6 +2941,63 @@
>> '*udp': 'str' } }
>>
>> ##
>> +# @NetdevL2TPv3Options
>> +#
>> +# Connect the VLAN to Ethernet over L2TPv3 Static tunnel
>> +#
>> +# @src: source address
>> +#
>> +# @dst: destination address
>> +#
>> +#
>> +# @txsession: 32 bit transmit session
>> +#
>> +# @rxsession: 32 bit receive session - if not specified
>> +# set to the same value as transmit
> Missing #optional on rxsession.
Will fix.
>
>> +#
>> +# @offset: #optional additional offset - allows the insertion of
>> +# additional application-specific data before the packet payload
>> +#
>> +# Since 2.0
> You've missed 2.0; this should be 2.1.
OK.
>
>
>> +
>> +##
>> +##
>> # @NetdevVdeOptions
> No need to add a second line of ## to NetdevVdeOptions.
>
>> #
>> # Connect the VLAN to a vde switch running on the host.
>> @@ -3014,13 +3071,16 @@
>> # A discriminated record of network device traits.
>> #
>> # Since 1.2
>> -##
>> +#
>> +# Added in 2.0 - l2tpv3
> 2.1
OK.
>
>
>> +#ifdef __linux__
>> + "-net
>> l2tpv3[,vlan=n][,name=str],src=srcaddr,dst=dstaddr[,srcport=srcport][,dstport=dstport],txsession=txsession[,rxsession=rxsession][,ipv6=on/off][,udp=on/off][,cookie64=on/off][,counter][,pincounter][,txcookie=txcookie][,rxcookie=rxcookie][,offset=offset]\n"
>> + " connect the VLAN to an Ethernet over L2TPv3
>> pseudowire\n"
>> + " Linux kernel 3.3+ as well as most routers can talk \n"
> Trailing whitespace in the output.
>
>> + " L2TPv3. This transport allows to connect a VM to a
>> VM,\n"
>> + " VM to a router and even VM to Host. It is a
>> nearly-universal\n"
>> + " standard (RFC3391). Note - this implementation uses
>> static\n"
>> + " pre-configured tunnels (same as the linux kernel). \n"
> and again
Will fix.
>
>> @@ -1408,11 +1431,11 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
>> " on host and listening for incoming connections on
>> 'socketpath'.\n"
>> " Use group 'groupname' and mode 'octalmode' to change
>> default\n"
>> " ownership and permissions for communication port.\n"
>> -#endif
>> "-net dump[,vlan=n][,file=f][,len=n]\n"
>> " dump traffic on vlan 'n' to file 'f' (max n bytes per
>> packet)\n"
>> "-net none use it alone to have zero network devices. If no -net
>> option\n"
>> " is provided, the default is '-net nic -net user'\n",
>> QEMU_ARCH_ALL)
>> +#endif
> Why is this #endif moving?
Dunno, that is the way it worked out after adding it :) The format of
the file does not win the "readability
of the year" award :)
I'd much rather have a TeX or LaTeX original and a set of macros/styles
to generate the necessary outputs.
I will move it of course.
A.
>
