The following changes since commit 32c7e0ab755745e961f1772e95cac381cc68769d:
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170421' into staging (2017-04-21 15:59:27 +0100) are available in the git repository at: https://github.com/jasowang/qemu.git tags/net-pull-request for you to fetch changes up to 049f6d8237dd0b14dee02e4c22b20114c43cecff: COLO-compare: Optimize tcp compare trace event (2017-04-24 11:30:36 +0800) ---------------------------------------------------------------- ---------------------------------------------------------------- Cédric Le Goater (5): hw/net: add MII definitions net: add FTGMAC100 support net/ftgmac100: add a 'aspeed' property aspeed: add a FTGMAC100 nic slirp: add a fake NC-SI backend Zhang Chen (3): colo-compare: Fix old packet check bug. COLO-compare: Optimize tcp compare for option field COLO-compare: Optimize tcp compare trace event default-configs/arm-softmmu.mak | 1 + hw/arm/aspeed_soc.c | 21 + hw/net/Makefile.objs | 1 + hw/net/ftgmac100.c | 1016 +++++++++++++++++++++++++++++++++++++++ include/hw/arm/aspeed_soc.h | 2 + include/hw/net/ftgmac100.h | 64 +++ include/hw/net/mii.h | 71 ++- include/net/eth.h | 1 + net/colo-compare.c | 69 ++- net/trace-events | 3 +- slirp/Makefile.objs | 2 +- slirp/ncsi-pkt.h | 419 ++++++++++++++++ slirp/ncsi.c | 130 +++++ slirp/slirp.c | 4 + slirp/slirp.h | 3 + 15 files changed, 1770 insertions(+), 37 deletions(-) create mode 100644 hw/net/ftgmac100.c create mode 100644 include/hw/net/ftgmac100.h create mode 100644 slirp/ncsi-pkt.h create mode 100644 slirp/ncsi.c
