[Qemu-commits] [qemu/qemu] 0b11c0: slirp: Allow disabling IPv4 or IPv6

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0b11c036620251f8f831ab8f0d9a7280ec1c4813
      
https://github.com/qemu/qemu/commit/0b11c036620251f8f831ab8f0d9a7280ec1c4813
  Author: Samuel Thibault <address@hidden>
  Date:   2016-04-01 (Fri, 01 Apr 2016)

  Changed paths:
    M net/slirp.c
    M qapi-schema.json
    M qemu-options.hx
    M slirp/ip6_icmp.c
    M slirp/ip6_input.c
    M slirp/ip_input.c
    M slirp/libslirp.h
    M slirp/slirp.c
    M slirp/slirp.h

  Log Message:
  -----------
  slirp: Allow disabling IPv4 or IPv6

Add ipv4 and ipv6 boolean options, so the user can setup IPv4-only and
IPv6-only network environments.

Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: bdc5db01c354abf19d21872cbcf51328bb8650db
      
https://github.com/qemu/qemu/commit/bdc5db01c354abf19d21872cbcf51328bb8650db
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M net/slirp.c
    M qapi-schema.json
    M qemu-options.hx
    M slirp/ip6_icmp.c
    M slirp/ip6_input.c
    M slirp/ip_input.c
    M slirp/libslirp.h
    M slirp/slirp.c
    M slirp/slirp.h

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# 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: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/de1d099a448b...bdc5db01c354