The following changes since commit b951cda21d6b232f138ccf008e12bce8ddc95465:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
(2015-05-11 12:01:09 +0100)
are available in the git repository at:
git://github.com/stefanha/qemu.git tags/net-pull-request
for you to fetch changes up to 7db161f6dd144760b2912026d992837ef80ca7e7:
rocker: timestamp on the debug logs helps correlate with events in the VM
(2015-05-11 14:49:04 +0100)
----------------------------------------------------------------
----------------------------------------------------------------
David Ahern (1):
rocker: timestamp on the debug logs helps correlate with events in the
VM
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
MAINTAINERS | 6 +
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 | 2315 +++++++++++++++++++++++++++++++++++++++++
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 | 7 +
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 +
30 files changed, 6836 insertions(+), 9 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
