OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Rework ipv6 options 

Rename the recently-added ip6-foo options into ipv6-foo options, to make
them coherent with other ipv6 options.

Also rework the documentation.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Samuel Thibault 2016-03-25 00:02:58 +01:00
parent 1c3c8e9547
commit d8eb386495
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/slirp.c
View File

@ -828,10 +828,10 @@ int net_init_slirp(const NetClientOptions *opts, const char *name,
net_init_slirp_configs(user->guestfwd, 0); net_init_slirp_configs(user->guestfwd, 0);
ret = net_slirp_init(peer, "user", name, user->q_restrict, vnet, ret = net_slirp_init(peer, "user", name, user->q_restrict, vnet,
user->host, user->ip6_prefix, user->ip6_prefixlen, user->host, user->ipv6_prefix, user->ipv6_prefixlen,
user->ip6_host, user->hostname, user->tftp, user->ipv6_host, user->hostname, user->tftp,
user->bootfile, user->dhcpstart, user->bootfile, user->dhcpstart,
user->dns, user->ip6_dns, user->smb, user->dns, user->ipv6_dns, user->smb,
user->smbserver, dnssearch); user->smbserver, dnssearch);
while (slirp_configs) { while (slirp_configs) {

25
qapi-schema.json
View File

@ -2427,7 +2427,10 @@
# #
# @ip: #optional legacy parameter, use net= instead # @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] The netmask is optional, and can be
# either in the form a.b.c.d or as a number of valid top-most
# bits. Default is 10.0.2.0/24.
# #
# @host: #optional guest-visible address of the host # @host: #optional guest-visible address of the host
# #
@ -2443,13 +2446,17 @@
# @dnssearch: #optional list of DNS suffixes to search, passed as DHCP option # @dnssearch: #optional list of DNS suffixes to search, passed as DHCP option
# to the guest # to the guest
# #
# @ip6-prefix: #optional IPv6 network prefix (default is fec0::) (since 2.6) # @ipv6-prefix: #optional IPv6 network prefix (default is fec0::) (since
# 2.6). The network prefix is given in the usual
# hexadecimal IPv6 address notation.
# #
# @ip6-prefixlen: #optional IPv6 network prefix length (default is 64) (since 2.6) # @ipv6-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) # @ipv6-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) # @ipv6-dns: #optional guest-visible IPv6 address of the virtual
# nameserver (since 2.6)
# #
# @smb: #optional root directory of the built-in SMB server # @smb: #optional root directory of the built-in SMB server
# #
@ -2474,10 +2481,10 @@
'*dhcpstart': 'str', '*dhcpstart': 'str',
'*dns': 'str', '*dns': 'str',
'*dnssearch': ['String'], '*dnssearch': ['String'],
'*ip6-prefix': 'str', '*ipv6-prefix': 'str',
'*ip6-prefixlen': 'int', '*ipv6-prefixlen': 'int',
'*ip6-host': 'str', '*ipv6-host': 'str',
'*ip6-dns': 'str', '*ipv6-dns': 'str',
'*smb': 'str', '*smb': 'str',
'*smbserver': 'str', '*smbserver': 'str',
'*hostfwd': ['String'], '*hostfwd': ['String'],

18
qemu-options.hx
View File

@ -1560,9 +1560,9 @@ DEF("smb", HAS_ARG, QEMU_OPTION_smb, "", QEMU_ARCH_ALL)
DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
#ifdef CONFIG_SLIRP #ifdef CONFIG_SLIRP
"-netdev user,id=str[,net=addr[/mask]][,host=addr][,ip6-net=addr[/int]]\n" "-netdev user,id=str[,net=addr[/mask]][,host=addr][,ipv6-net=addr[/int]]\n"
" [,ip6-host=addr][,restrict=on|off][,hostname=host][,dhcpstart=addr]\n" " [,ipv6-host=addr][,restrict=on|off][,hostname=host][,dhcpstart=addr]\n"
" [,dns=addr][,ip6-dns=addr][,dnssearch=domain][,tftp=dir]\n" " [,dns=addr][,ipv6-dns=addr][,dnssearch=domain][,tftp=dir]\n"
" [,bootfile=f][,hostfwd=rule][,guestfwd=rule]" " [,bootfile=f][,hostfwd=rule][,guestfwd=rule]"
#ifndef _WIN32 #ifndef _WIN32
"[,smb=dir[,smbserver=addr]]\n" "[,smb=dir[,smbserver=addr]]\n"
@ -1719,11 +1719,13 @@ either in the form a.b.c.d or as number of valid top-most bits. Default is
Specify the guest-visible address of the host. Default is the 2nd IP in the Specify the guest-visible address of the host. Default is the 2nd IP in the
guest network, i.e. x.x.x.2. guest network, i.e. x.x.x.2.
@item ip6-net=@var{addr}[/@var{int}] @item ipv6-net=@var{addr}[/@var{int}]
Set IPv6 network address the guest will see. Optionally specify the prefix Set IPv6 network address the guest will see (default is fec0::/64). The
size, as number of valid top-most bits. Default is fec0::/64. network prefix is given in the usual hexadecimal IPv6 address
notation. The prefix size is optional, and is given as the number of
valid top-most bits (default is 64).
@item ip6-host=@var{addr} @item ipv6-host=@var{addr}
Specify the guest-visible IPv6 address of the host. Default is the 2nd IPv6 in Specify the guest-visible IPv6 address of the host. Default is the 2nd IPv6 in
the guest network, i.e. xxxx::2. the guest network, i.e. xxxx::2.
@ -1744,7 +1746,7 @@ Specify the guest-visible address of the virtual nameserver. The address must
be different from the host address. Default is the 3rd IP in the guest network, be different from the host address. Default is the 3rd IP in the guest network,
i.e. x.x.x.3. i.e. x.x.x.3.
@item ip6-dns=@var{addr} @item ipv6-dns=@var{addr}
Specify the guest-visible address of the IPv6 virtual nameserver. The address Specify the guest-visible address of the IPv6 virtual nameserver. The address
must be different from the host address. Default is the 3rd IP in the guest must be different from the host address. Default is the 3rd IP in the guest
network, i.e. xxxx::3. network, i.e. xxxx::3.