The following changes since commit 287db79df8af8e31f18e262feb5e05103a09e4d4:
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging (2016-05-24 13:06:33 +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 517b5e9a175fe7d47cc0fab6c2310241fd33c115: Add ENET device to i.MX6 SOC. (2016-06-02 10:42:46 +0800) ---------------------------------------------------------------- Main changes: - e1000e emulation - convet vmxnet3 to use DMA api - ENET support for FEC device Changes from V3: - add ENET series - fix clang sanitizer about misaligned access Changes from V2: - fix clang build Changes from V1: - fix 32bit build ---------------------------------------------------------------- Dmitry Fleytman (17): pci: fix unaligned access in pci_xxx_quad() msix: make msix_clr_pending() visible for clients pci: Introduce define for PM capability version 1.1 pcie: Add support for PCIe CAP v1 pcie: Introduce function for DSN capability creation vmxnet3: Use generic function for DSN capability definition net: Introduce Toeplitz hash calculator net: Add macros for MAC address tracing vmxnet3: Use common MAC address tracing macros net_pkt: Name vmxnet3 packet abstractions more generic rtl8139: Move more TCP definitions to common header net_pkt: Extend packet abstraction as required by e1000e functionality vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_* e1000_regs: Add definitions for Intel 82574-specific bits e1000: Move out code that will be reused in e1000e net: Introduce e1000e device emulation e1000e: Introduce qtest for e1000e device Eduardo Habkost (1): net: vl: Move default_net to vl.c Jean-Christophe Dubois (10): net: improve UDP/TCP checksum computation. net: handle optional VLAN header in checksum computation. i.MX: Fix FEC code for MDIO operation selection i.MX: Fix FEC code for MDIO address selection i.MX: Fix FEC code for ECR register reset value. i.MX: reset TX/RX descriptors when FEC is disabled. i.MX: Rename i.MX FEC defines to ENET_XXX i.MX: move FEC device to a register array structure. Add ENET/Gbps Ethernet support to FEC device Add ENET device to i.MX6 SOC. Prasad J Pandit (1): net: mipsnet: check packet length against buffer Zhang Chen (1): net/net: Add SocketReadState for reuse codes Zhou Jie (1): net/tap: Allocating Large sized arrays to heap MAINTAINERS | 18 + default-configs/pci.mak | 1 + hw/arm/fsl-imx25.c | 1 + hw/arm/fsl-imx6.c | 17 + hw/net/Makefile.objs | 5 +- hw/net/e1000.c | 411 +--- hw/net/e1000_regs.h | 349 ++- hw/net/e1000e.c | 739 +++++++ hw/net/e1000e_core.c | 3476 ++++++++++++++++++++++++++++++ hw/net/e1000e_core.h | 146 ++ hw/net/e1000x_common.c | 267 +++ hw/net/e1000x_common.h | 213 ++ hw/net/imx_fec.c | 1009 ++++++--- hw/net/mipsnet.c | 3 + hw/net/net_rx_pkt.c | 600 ++++++ hw/net/net_rx_pkt.h | 363 ++++ hw/net/{vmxnet_tx_pkt.c => net_tx_pkt.c} | 358 +-- hw/net/net_tx_pkt.h | 191 ++ hw/net/rtl8139.c | 5 - hw/net/vmxnet3.c | 155 +- hw/net/vmxnet_debug.h | 3 - hw/net/vmxnet_rx_pkt.c | 187 -- hw/net/vmxnet_rx_pkt.h | 174 -- hw/net/vmxnet_tx_pkt.h | 146 -- hw/pci/msix.c | 2 +- hw/pci/pcie.c | 94 +- include/hw/arm/fsl-imx6.h | 6 +- include/hw/net/imx_fec.h | 250 ++- include/hw/pci/msix.h | 1 + include/hw/pci/pci.h | 11 +- include/hw/pci/pci_regs.h | 2 + include/hw/pci/pcie.h | 5 + include/hw/pci/pcie_regs.h | 5 +- include/net/checksum.h | 49 +- include/net/eth.h | 158 +- include/net/net.h | 19 +- net/checksum.c | 128 +- net/eth.c | 410 +++- net/filter-mirror.c | 66 +- net/net.c | 93 +- net/socket.c | 77 +- net/tap.c | 6 +- tests/Makefile | 7 +- tests/e1000e-test.c | 479 ++++ trace-events | 213 ++ vl.c | 24 +- 46 files changed, 9306 insertions(+), 1636 deletions(-) create mode 100644 hw/net/e1000e.c create mode 100644 hw/net/e1000e_core.c create mode 100644 hw/net/e1000e_core.h create mode 100644 hw/net/e1000x_common.c create mode 100644 hw/net/e1000x_common.h create mode 100644 hw/net/net_rx_pkt.c create mode 100644 hw/net/net_rx_pkt.h rename hw/net/{vmxnet_tx_pkt.c => net_tx_pkt.c} (52%) create mode 100644 hw/net/net_tx_pkt.h delete mode 100644 hw/net/vmxnet_rx_pkt.c delete mode 100644 hw/net/vmxnet_rx_pkt.h delete mode 100644 hw/net/vmxnet_tx_pkt.h create mode 100644 tests/e1000e-test.c
