On 29.03.2016 01:44, 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> > > --- > > Changes since previous versions: > > - fix coding style > --- > net/slirp.c | 36 ++++++++++++++++++++++++++++++------ > qapi-schema.json | 8 ++++++++ > qemu-options.hx | 8 ++++++-- > slirp/ip6_icmp.c | 8 ++++++++ > slirp/ip6_input.c | 5 +++++ > slirp/ip_input.c | 4 ++++ > slirp/libslirp.h | 3 ++- > slirp/slirp.c | 10 +++++++++- > slirp/slirp.h | 2 ++ > 9 files changed, 74 insertions(+), 10 deletions(-) > [...] > diff --git a/qemu-options.hx b/qemu-options.hx > index 09162f5..705f162 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -1551,8 +1551,9 @@ DEF("smb", HAS_ARG, QEMU_OPTION_smb, "", QEMU_ARCH_ALL) > > DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, > #ifdef CONFIG_SLIRP > - "-netdev > user,id=str[,net=addr[/mask]][,host=addr][,ipv6-net=addr[/int]]\n" > - " > [,ipv6-host=addr][,restrict=on|off][,hostname=host][,dhcpstart=addr]\n" > + "-netdev user,id=str[,ipv4][,net=addr[/mask]][,host=addr]\n" > + " [,ipv6][,ipv6-net=addr[/int]][,ipv6-host=addr]\n" > + " [,restrict=on|off][,hostname=host][,dhcpstart=addr]\n" > " [,dns=addr][,ipv6-dns=addr][,dnssearch=domain][,tftp=dir]\n" > " [,bootfile=f][,hostfwd=rule][,guestfwd=rule]"
Shouldn't that rather be "[,ipv4=on|off]" and "[,ipv6=on|off]" for a boolean value? Apart from that, the patch looks fine to me. Thomas