Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-03-21-tag' into staging (2016-03-22 17:39:48 +0000)
are available in the git repository at: http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault for you to fetch changes up to d8eb38649587c58d767c3bc6a1075bfeabda9e8a: Rework ipv6 options (2016-03-29 01:15:43 +0200) ---------------------------------------------------------------- slirp updates ---------------------------------------------------------------- Peter Maydell (1): Use C99 flexible array instead of 1-byte trailing array Samuel Thibault (4): slirp: Fix memory leak on small incoming ipv4 packet slirp: send icmp6 errors when UDP send failed Avoid embedding struct mbuf in other structures Rework ipv6 options net/slirp.c | 6 +++--- qapi-schema.json | 25 ++++++++++++++++--------- qemu-options.hx | 18 ++++++++++-------- slirp/if.c | 27 ++++++++++++++------------- slirp/ip_input.c | 2 +- slirp/mbuf.c | 19 ++++++++++--------- slirp/mbuf.h | 6 ++---- slirp/misc.c | 5 ----- slirp/misc.h | 5 +++++ slirp/slirp.h | 8 +++++--- slirp/udp6.c | 3 +-- 11 files changed, 67 insertions(+), 57 deletions(-)
