The following changes since commit de1d099a448beb2ec39af4bd9ce4dd6452a18cb5:
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging (2016-04-01 11:15:20 +0100) are available in the git repository at: http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault-2 for you to fetch changes up to 0b11c036620251f8f831ab8f0d9a7280ec1c4813: slirp: Allow disabling IPv4 or IPv6 (2016-04-01 17:51:55 +0200) ---------------------------------------------------------------- slirp updates (2) ---------------------------------------------------------------- Samuel Thibault (1): slirp: Allow disabling IPv4 or IPv6 net/slirp.c | 36 ++++++++++++++++++++++++++++++------ qapi-schema.json | 8 ++++++++ qemu-options.hx | 8 ++++++-- slirp/ip6_icmp.c | 8 ++++++++ slirp/ip6_input.c | 5 +++++ slirp/ip_input.c | 4 ++++ slirp/libslirp.h | 3 ++- slirp/slirp.c | 10 +++++++++- slirp/slirp.h | 2 ++ 9 files changed, 74 insertions(+), 10 deletions(-)
