v3: * Add clang 3.5.0 warning fixes * Squash David Ahern's clang struct definition warnings fix
v2: * Squash in Jiri's fix for rocker format string specifiers [Peter] * Squash in Windows build fix [Peter] * Both build fixes are described in "rocker: add new rocker switch device" The following changes since commit ee74801035b0b5f1fdfd4e31d3a53f511f91c804: Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150311' into staging (2015-03-11 18:22:15 +0000) are available in the git repository at: git://github.com/stefanha/qemu.git tags/net-pull-request for you to fetch changes up to 92935abc6b4f5b9eec6607879bfbfafa5c367494: rocker: timestamp on the debug logs helps correlate with events in the VM (2015-03-12 10:55:22 +0000) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- David Ahern (1): rocker: timestamp on the debug logs helps correlate with events in the VM Frediano Ziglio (1): tests: rtl8139: test timers and interrupt Paolo Bonzini (1): net: synchronize net_host_device_remove with host_net_remove_completion Scott Feldman (8): net: add MAC address string printer virtio-net: use qemu_mac_strdup_printf rocker: add register programming guide pci: add rocker device ID pci: add network device class 'other' for network switches rocker: add new rocker switch device rocker: add tests MAINTAINERS: add rocker Stefan Hajnoczi (2): configure: handle clang -nopie argument warning configure: silence glib unknown attribute __alloc_size__ MAINTAINERS | 6 + configure | 12 +- default-configs/pci.mak | 1 + docs/specs/pci-ids.txt | 1 + docs/specs/rocker.txt | 1009 ++++++++++++++++++ hw/net/Makefile.objs | 4 + hw/net/rocker/rocker.c | 1480 ++++++++++++++++++++++++++ hw/net/rocker/rocker.h | 84 ++ hw/net/rocker/rocker_desc.c | 377 +++++++ hw/net/rocker/rocker_desc.h | 53 + hw/net/rocker/rocker_fp.c | 234 +++++ hw/net/rocker/rocker_fp.h | 51 + hw/net/rocker/rocker_hw.h | 491 +++++++++ hw/net/rocker/rocker_of_dpa.c | 2314 +++++++++++++++++++++++++++++++++++++++++ hw/net/rocker/rocker_of_dpa.h | 22 + hw/net/rocker/rocker_tlv.h | 244 +++++ hw/net/rocker/rocker_world.c | 106 ++ hw/net/rocker/rocker_world.h | 60 ++ hw/net/virtio-net.c | 12 +- include/hw/pci/pci.h | 1 + include/hw/pci/pci_ids.h | 1 + include/net/net.h | 1 + net/net.c | 13 +- tests/Makefile | 2 +- tests/rocker/README | 5 + tests/rocker/all | 19 + tests/rocker/bridge | 48 + tests/rocker/bridge-stp | 57 + tests/rocker/bridge-vlan | 57 + tests/rocker/bridge-vlan-stp | 69 ++ tests/rocker/port | 22 + tests/rocker/tut.dot | 8 + tests/rtl8139-test.c | 181 ++++ 33 files changed, 7031 insertions(+), 14 deletions(-) create mode 100644 docs/specs/rocker.txt create mode 100644 hw/net/rocker/rocker.c create mode 100644 hw/net/rocker/rocker.h create mode 100644 hw/net/rocker/rocker_desc.c create mode 100644 hw/net/rocker/rocker_desc.h create mode 100644 hw/net/rocker/rocker_fp.c create mode 100644 hw/net/rocker/rocker_fp.h create mode 100644 hw/net/rocker/rocker_hw.h create mode 100644 hw/net/rocker/rocker_of_dpa.c create mode 100644 hw/net/rocker/rocker_of_dpa.h create mode 100644 hw/net/rocker/rocker_tlv.h create mode 100644 hw/net/rocker/rocker_world.c create mode 100644 hw/net/rocker/rocker_world.h create mode 100644 tests/rocker/README create mode 100755 tests/rocker/all create mode 100755 tests/rocker/bridge create mode 100755 tests/rocker/bridge-stp create mode 100755 tests/rocker/bridge-vlan create mode 100755 tests/rocker/bridge-vlan-stp create mode 100755 tests/rocker/port create mode 100644 tests/rocker/tut.dot -- 2.1.0