On 03/24/2016 04:12 PM, Samuel Thibault wrote: > Add ipv4 and ipv6 boolean options, so the user can setup IPv4-only and > IPv6-only network environments. > > Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Please mention in the commit message that you are renaming recently-added members, and therefore this MUST be done in 2.6 before we bake in the old naming, as part of your commit... > > --- > > Changes since previous versions: > > - Introduce boolean options ipv4 and ipv6 instead of net=none and > ip6-net=none. > - Rename ipv6 options to ipv6-foo instead of ip6-foo, to make it coherent > with the new ipv6 option (itself coherent with the other ipv6 options) ...rather than just a parenthetical note that gets lost during 'git am'. In fact, I'd probably split it into two patches: one to rename existing s/ip6-/ipv6-/ members, and the other to add new boolean members. > +++ b/qapi-schema.json > @@ -2425,9 +2425,18 @@ > # > # @restrict: #optional isolate the guest from the host > # > +# @ipv4: #optional whether to support IPv4, default is to support both > +# IPv4 and IPv6 (since 2.6) The last part is long; maybe: ..., default true for enabled (since 2.6) > +# > +# @ipv6: #optional whether to support IPv6, default is to support both > +# IPv4 and IPv6 (since 2.6) and again. > +# > # @ip: #optional legacy parameter, use net= instead > # > -# @net: #optional IP address and optional netmask > +# @net: #optional IP network address that the guest will see, in the > +# form addr[/netmask] (default is 10.0.2.0/24). The netmask is optional, > +# and can be either in the form a.b.c.d or as a number of valid top-most > +# bits. Many QAPI commands do hanging indents, as in: # @net: #optional IP network address that the guest will see, in the # form addr[/netmask] (default is 10.0.2.0/24). The netmask is # optional, and can ... so that it is easier to spot the next member's documentation. But I don't think it is a strict requirement. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
