diff options
| author | Peter Maydell | 2016-03-29 19:25:27 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-03-29 19:25:27 +0200 |
| commit | 5b8e6b4cc279e4434ddda94a6b2848834883ec9c (patch) | |
| tree | 2470df6c2781463887f11f93f32e6a4ab30d6ad2 /net | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160328.0' i... (diff) | |
| parent | Rework ipv6 options (diff) | |
| download | qemu-5b8e6b4cc279e4434ddda94a6b2848834883ec9c.tar.gz qemu-5b8e6b4cc279e4434ddda94a6b2848834883ec9c.tar.xz qemu-5b8e6b4cc279e4434ddda94a6b2848834883ec9c.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Tue 29 Mar 2016 00:16:05 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:
Rework ipv6 options
Use C99 flexible array instead of 1-byte trailing array
Avoid embedding struct mbuf in other structures
slirp: send icmp6 errors when UDP send failed
slirp: Fix memory leak on small incoming ipv4 packet
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/slirp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/slirp.c b/net/slirp.c index 0bcef226e2..791a8f7b89 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -829,10 +829,10 @@ int net_init_slirp(const NetClientOptions *opts, const char *name, net_init_slirp_configs(user->guestfwd, 0); ret = net_slirp_init(peer, "user", name, user->q_restrict, vnet, - user->host, user->ip6_prefix, user->ip6_prefixlen, - user->ip6_host, user->hostname, user->tftp, + user->host, user->ipv6_prefix, user->ipv6_prefixlen, + user->ipv6_host, user->hostname, user->tftp, user->bootfile, user->dhcpstart, - user->dns, user->ip6_dns, user->smb, + user->dns, user->ipv6_dns, user->smb, user->smbserver, dnssearch); while (slirp_configs) { |