On 02/23/2016 03:28 AM, Samuel Thibault wrote:
> From: Yann Bordenave <m...@meowstars.org>
>
> This patch adds parameters to manage some new options in the qemu -net
> command.
> Slirp IPv6 address, network prefix, and DNS IPv6 address can be given in
> argument to the qemu command.
> Defaults parameters are respectively fec0::2, fec0::, /64 and fec0::3.
>
> Signed-off-by: Yann Bordenave <m...@meowstars.org>
> Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
> ---
> net/net.c | 31 +++++++++++++++++++++++++
> net/slirp.c | 69
> +++++++++++++++++++++++++++++++++++++++++++++++++++-----
> qapi-schema.json | 40 ++++++++++++++++++++------------
> qemu-options.hx | 18 +++++++++++++--
> slirp/libslirp.h | 8 ++++---
> slirp/slirp.c | 16 +++++++------
> 6 files changed, 150 insertions(+), 32 deletions(-)
>
> diff --git a/net/net.c b/net/net.c
> index aebf753..d67904f 100644
[...]
>
> while (slirp_configs) {
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 8d04897..a62c2ec 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -2399,6 +2399,14 @@
> # @dnssearch: #optional list of DNS suffixes to search, passed as DHCP option
> # to the guest
> #
> +# @ip6-prefix: #optional IPv6 network prefix (default is fec0::) (since 2.6)
> +#
> +# @ip6-prefixlen: #optional IPv6 network prefix length (default is 64)
> (since 2.6)
> +#
> +# @ip6-host: #optional guest-visible IPv6 address of the host (since 2.6)
> +#
> +# @ip6-dns: #optional guest-visible IPv6 address of the virtual nameserver
> (since 2.6)
> +#
> # @smb: #optional root directory of the built-in SMB server
> #
> # @smbserver: #optional IP address of the built-in SMB server
> @@ -2412,20 +2420,24 @@
> ##
> { 'struct': 'NetdevUserOptions',
> 'data': {
> - '*hostname': 'str',
> - '*restrict': 'bool',
> - '*ip': 'str',
> - '*net': 'str',
> - '*host': 'str',
> - '*tftp': 'str',
> - '*bootfile': 'str',
> - '*dhcpstart': 'str',
> - '*dns': 'str',
> - '*dnssearch': ['String'],
> - '*smb': 'str',
> - '*smbserver': 'str',
> - '*hostfwd': ['String'],
> - '*guestfwd': ['String'] } }
> + '*hostname': 'str',
> + '*restrict': 'bool',
> + '*ip': 'str',
> + '*net': 'str',
> + '*host': 'str',
> + '*tftp': 'str',
> + '*bootfile': 'str',
> + '*dhcpstart': 'str',
> + '*dns': 'str',
> + '*dnssearch': ['String'],
> + '*ip6-prefix': 'str',
> + '*ip6-prefixlen': 'int',
> + '*ip6-host': 'str',
> + '*ip6-dns': 'str',
> + '*smb': 'str',
> + '*smbserver': 'str',
> + '*hostfwd': ['String'],
> + '*guestfwd': ['String'] } }
Please do unnecessary changes like this since it will cause extra effort
for git blame and other things.
