The following changes since commit 31e49ac192f782d594bbd04070fe79e800b7813f:
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151111' into staging (2015-11-11 18:23:08 +0000) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 39bec4f38b028a2cff8c38f3455aef44d7b3b6c4: net: netmap: use error_setg() helpers in place of error_report() (2015-11-12 15:31:52 +0800) ---------------------------------------------------------------- Changes from V1: - no changes in the patches, V1 just misses the list ---------------------------------------------------------------- Leonid Bloch (9): e1000: Cosmetic and alignment fixes e1000: Add support for migrating the entire MAC registers' array e1000: Introduced an array to control the access to the MAC registers e1000: Trivial implementation of various MAC registers e1000: Fixing the received/transmitted packets' counters e1000: Fixing the received/transmitted octets' counters e1000: Fixing the packet address filtering procedure e1000: Implementing various counters e1000: Introducing backward compatibility command line parameter Stefan Weil (1): slirp: Fix type casts and format strings in debug code Vincenzo Maffione (2): net: netmap: Fix compilation issue net: netmap: use error_setg() helpers in place of error_report() hw/net/e1000.c | 476 ++++++++++++++++++++++++++++++++++++++++------------ hw/net/e1000_regs.h | 8 +- include/hw/compat.h | 6 +- net/netmap.c | 24 +-- slirp/bootp.c | 12 +- slirp/if.c | 4 +- slirp/ip_icmp.c | 4 +- slirp/ip_input.c | 10 +- slirp/ip_output.c | 4 +- slirp/mbuf.c | 6 +- slirp/misc.c | 6 +- slirp/sbuf.c | 4 +- slirp/socket.c | 18 +- slirp/tcp_input.c | 14 +- slirp/tcp_output.c | 2 +- slirp/tcp_subr.c | 16 +- slirp/udp.c | 6 +- 17 files changed, 448 insertions(+), 172 deletions(-) -- 2.1.4