Commit bdc5db01 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging 



slirp updates (2)

# gpg: Signature made Fri 01 Apr 2016 16:52:09 BST using RSA key ID FB6B2F1D
# gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: F632 74CD C630 0873 CB3D  29D9 E3E5 1CE8 FB6B 2F1D

* remotes/thibault/tags/samuel-thibault-2:
  slirp: Allow disabling IPv4 or IPv6

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents de1d099a 0b11c036

net/slirp.c

+30 −6
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ static NetClientInfo net_slirp_info = { 


static int net_slirp_init(NetClientState *peer, const char *model,

                          const char *name, int restricted,

                          const char *vnetwork, const char *vhost,

                          const char *vprefix6, int vprefix6_len,

                          bool ipv4, const char *vnetwork, const char *vhost,

                          bool ipv6, const char *vprefix6, int vprefix6_len,

                          const char *vhost6,

                          const char *vhostname, const char *tftp_export,

                          const char *bootfile, const char *vdhcp_start,
@@ -165,6 +165,19 @@ static int net_slirp_init(NetClientState *peer, const char *model, 
    char *end;

    struct slirp_config_str *config;



    if (!ipv4 && (vnetwork || vhost || vnameserver)) {

        return -1;

    }



    if (!ipv6 && (vprefix6 || vhost6 || vnameserver6)) {

        return -1;

    }



    if (!ipv4 && !ipv6) {

        /* It doesn't make sense to disable both */

        return -1;

    }



    if (!tftp_export) {

        tftp_export = legacy_tftp_prefix;

    }
@@ -309,8 +322,8 @@ static int net_slirp_init(NetClientState *peer, const char *model, 


    s = DO_UPCAST(SlirpState, nc, nc);



    s->slirp = slirp_init(restricted, net, mask, host,

                          ip6_prefix, vprefix6_len, ip6_host,

    s->slirp = slirp_init(restricted, ipv4, net, mask, host,

                          ipv6, ip6_prefix, vprefix6_len, ip6_host,

                          vhostname, tftp_export, bootfile, dhcp,

                          dns, ip6_dns, dnssearch, s);

    QTAILQ_INSERT_TAIL(&slirp_stacks, s, entry);
@@ -813,10 +826,20 @@ int net_init_slirp(const NetClientOptions *opts, const char *name, 
    int ret;

    const NetdevUserOptions *user;

    const char **dnssearch;

    bool ipv4 = true, ipv6 = true;



    assert(opts->type == NET_CLIENT_OPTIONS_KIND_USER);

    user = opts->u.user.data;



    if ((user->has_ipv6 && user->ipv6 && !user->has_ipv4) ||

        (user->has_ipv4 && !user->ipv4)) {

        ipv4 = 0;

    }

    if ((user->has_ipv4 && user->ipv4 && !user->has_ipv6) ||

        (user->has_ipv6 && !user->ipv6)) {

        ipv6 = 0;

    }



    vnet = user->has_net ? g_strdup(user->net) :

           user->has_ip  ? g_strdup_printf("%s/24", user->ip) :

           NULL;
@@ -828,8 +851,9 @@ int net_init_slirp(const NetClientOptions *opts, const char *name, 
    net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD);

    net_init_slirp_configs(user->guestfwd, 0);



    ret = net_slirp_init(peer, "user", name, user->q_restrict, vnet,

                         user->host, user->ipv6_prefix, user->ipv6_prefixlen,

    ret = net_slirp_init(peer, "user", name, user->q_restrict,

                         ipv4, vnet, user->host,

                         ipv6, user->ipv6_prefix, user->ipv6_prefixlen,

                         user->ipv6_host, user->hostname, user->tftp,

                         user->bootfile, user->dhcpstart,

                         user->dns, user->ipv6_dns, user->smb,

qapi-schema.json

+8 −0
Original line number Diff line number Diff line
@@ -2425,6 +2425,12 @@ 
#

# @restrict: #optional isolate the guest from the host

#

# @ipv4: #optional whether to support IPv4, default true for enabled

#        (since 2.6)

#

# @ipv6: #optional whether to support IPv6, default true for enabled

#        (since 2.6)

#

# @ip: #optional legacy parameter, use net= instead

#

# @net: #optional IP network address that the guest will see, in the
@@ -2473,6 +2479,8 @@ 
  'data': {

    '*hostname':  'str',

    '*restrict':  'bool',

    '*ipv4':      'bool',

    '*ipv6':      'bool',

    '*ip':        'str',

    '*net':       'str',

    '*host':      'str',

qemu-options.hx

+6 −2
Original line number Diff line number Diff line
@@ -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[=on|off]][,net=addr[/mask]][,host=addr]\n"

    "         [,ipv6[=on|off]][,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]"

#ifndef _WIN32
@@ -1701,6 +1702,9 @@ Connect user mode stack to VLAN @var{n} (@var{n} = 0 is the default). 
@itemx name=@var{name}

Assign symbolic name for use in monitor commands.



@option{ipv4} and @option{ipv6} specify that either IPv4 or IPv6 must

be enabled.  If neither is specified both protocols are enabled.



@item net=@var{addr}[/@var{mask}]

Set IP network address the guest will see. Optionally specify the netmask,

either in the form a.b.c.d or as number of valid top-most bits. Default is

slirp/ip6_icmp.c

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ static void ra_timer_handler(void *opaque) 


void icmp6_init(Slirp *slirp)

{

    if (!slirp->in6_enabled) {

        return;

    }



    slirp->ra_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, ra_timer_handler, slirp);

    timer_mod(slirp->ra_timer,

              qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + NDP_Interval);
@@ -31,6 +35,10 @@ void icmp6_init(Slirp *slirp) 


void icmp6_cleanup(Slirp *slirp)

{

    if (!slirp->in6_enabled) {

        return;

    }



    timer_del(slirp->ra_timer);

    timer_free(slirp->ra_timer);

}

slirp/ip6_input.c

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ void ip6_cleanup(Slirp *slirp) 
void ip6_input(struct mbuf *m)

{

    struct ip6 *ip6;

    Slirp *slirp = m->slirp;



    if (!slirp->in6_enabled) {

        goto bad;

    }



    DEBUG_CALL("ip6_input");

    DEBUG_ARG("m = %lx", (long)m);