qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 890ee6: net: add MAC address string printer

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 890ee6: net: add MAC address string printer
Date: Tue, 12 May 2015 04:00:05 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 890ee6abb385d6508bba7f5273c74a8e43bea6af
      
https://github.com/qemu/qemu/commit/890ee6abb385d6508bba7f5273c74a8e43bea6af
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M include/net/net.h
    M net/net.c

  Log Message:
  -----------
  net: add MAC address string printer

We can use this in virtio-net code as well as new Rocker driver code, so
up-level this.

Signed-off-by: Scott Feldman <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: b0575ba4a52c9259357af29d842950e978306fa4
      
https://github.com/qemu/qemu/commit/b0575ba4a52c9259357af29d842950e978306fa4
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: use qemu_mac_strdup_printf

Signed-off-by: Scott Feldman <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: bbc53c7e2580264fe2b6ea84bd8f3480bcc7c845
      
https://github.com/qemu/qemu/commit/bbc53c7e2580264fe2b6ea84bd8f3480bcc7c845
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    A docs/specs/rocker.txt

  Log Message:
  -----------
  rocker: add register programming guide

This is the register programming guide for the Rocker device.  It's intended
for driver writers and device writers.  It covers the device's PCI space,
the register set, DMA interface, and interrupts.

Signed-off-by: Scott Feldman <address@hidden>
Signed-off-by: Jiri Pirko <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5dcc26371dcc72976777c51f0251127716a59ed8
      
https://github.com/qemu/qemu/commit/5dcc26371dcc72976777c51f0251127716a59ed8
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M docs/specs/pci-ids.txt
    M include/hw/pci/pci.h

  Log Message:
  -----------
  pci: add rocker device ID

Signed-off-by: Scott Feldman <address@hidden>
Signed-off-by: Jiri Pirko <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dc407ae8a75d03cf48e114d3812d077fa29a8bd9
      
https://github.com/qemu/qemu/commit/dc407ae8a75d03cf48e114d3812d077fa29a8bd9
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M include/hw/pci/pci_ids.h

  Log Message:
  -----------
  pci: add network device class 'other' for network switches

Rocker is an ethernet switch device, so add 'other' network device class as
defined by PCI to cover these types of devices.

Signed-off-by: Scott Feldman <address@hidden>
Signed-off-by: Jiri Pirko <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dc488f888060afdc129e0cc8812cf50c4c083423
      
https://github.com/qemu/qemu/commit/dc488f888060afdc129e0cc8812cf50c4c083423
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M default-configs/pci.mak
    M hw/net/Makefile.objs
    A hw/net/rocker/rocker.c
    A hw/net/rocker/rocker.h
    A hw/net/rocker/rocker_desc.c
    A hw/net/rocker/rocker_desc.h
    A hw/net/rocker/rocker_fp.c
    A hw/net/rocker/rocker_fp.h
    A hw/net/rocker/rocker_hw.h
    A hw/net/rocker/rocker_of_dpa.c
    A hw/net/rocker/rocker_of_dpa.h
    A hw/net/rocker/rocker_tlv.h
    A hw/net/rocker/rocker_world.c
    A hw/net/rocker/rocker_world.h

  Log Message:
  -----------
  rocker: add new rocker switch device

Rocker is a simulated ethernet switch device.  The device supports up to 62
front-panel ports and supports L2 switching and L3 routing functions, as well
as L2/L3/L4 ACLs.  The device presents a single PCI device for each switch,
with a memory-mapped register space for device driver access.

Rocker device is invoked with -device, for example a 4-port switch:

  -device rocker,name=sw1,len-ports=4,ports[0]=dev0,ports[1]=dev1, \
   ports[2]=dev2,ports[3]=dev3

Each port is a netdev and can be paired with using -netdev id=<port name>.

Signed-off-by: Scott Feldman <address@hidden>
Signed-off-by: Jiri Pirko <address@hidden>
Acked-by: Scott Feldman <address@hidden>
Acked-by: Jiri Pirko <address@hidden>
Signed-off-by: David Ahern <address@hidden>
Message-id: address@hidden

rocker: fix clang compiler errors

Consolidate all forward typedef declarations to rocker.h.

Signed-off-by: David Ahern <address@hidden>
Acked-by: Scott Feldman <address@hidden>
Acked-by: Jiri Pirko <address@hidden>

rocker: add support for flow modification

We had support for flow add/del.  This adds support for flow mod.  I needed
this for L3 support where an existing route is modified using NLM_F_REPLACE.
For example:

  ip route add 12.0.0.0/30 nexthop via 11.0.0.1 dev swp1
  ip route change 12.0.0.0/30 nexthop via 11.0.0.9 dev swp2

The first cmd adds the route.  The second cmd changes the existing route by
changing its nexthop info.

In the device, a mod operation results in the matching flow enty being modified
with the new settings.  This is atomic to the device.

Signed-off-by: Scott Feldman <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 63d2ada2f55a85c3143ecf69a5aeecf6b3f3ffc9
      
https://github.com/qemu/qemu/commit/63d2ada2f55a85c3143ecf69a5aeecf6b3f3ffc9
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    A tests/rocker/README
    A tests/rocker/all
    A tests/rocker/bridge
    A tests/rocker/bridge-stp
    A tests/rocker/bridge-vlan
    A tests/rocker/bridge-vlan-stp
    A tests/rocker/port
    A tests/rocker/tut.dot

  Log Message:
  -----------
  rocker: add tests

Add some basic test for rocker to test L2/L3/L4 functionality.  Requires an
external test environment, simp, located here:

https://github.com/scottfeldman/simp

To run tests, simp environment must be installed and a suitable VM image built
and installed with a Linux 3.18 (or greater) kernel with rocker driver support
enabled.

Signed-off-by: Scott Feldman <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: de24d3f1013dbee65b42f34cb825f056647861a5
      
https://github.com/qemu/qemu/commit/de24d3f1013dbee65b42f34cb825f056647861a5
  Author: Scott Feldman <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: add rocker

Signed-off-by: Scott Feldman <address@hidden>
Signed-off-by: Jiri Pirko <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7db161f6dd144760b2912026d992837ef80ca7e7
      
https://github.com/qemu/qemu/commit/7db161f6dd144760b2912026d992837ef80ca7e7
  Author: David Ahern <address@hidden>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M hw/net/rocker/rocker.h

  Log Message:
  -----------
  rocker: timestamp on the debug logs helps correlate with events in the VM

Signed-off-by: David Ahern <address@hidden>
Signed-off-by: Scott Feldman <address@hidden>
Signed-off-by: Jiri Pirko <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 19fbe5084c1da6af95177c86e4cab64241d479a8
      
https://github.com/qemu/qemu/commit/19fbe5084c1da6af95177c86e4cab64241d479a8
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M MAINTAINERS
    M default-configs/pci.mak
    M docs/specs/pci-ids.txt
    A docs/specs/rocker.txt
    M hw/net/Makefile.objs
    A hw/net/rocker/rocker.c
    A hw/net/rocker/rocker.h
    A hw/net/rocker/rocker_desc.c
    A hw/net/rocker/rocker_desc.h
    A hw/net/rocker/rocker_fp.c
    A hw/net/rocker/rocker_fp.h
    A hw/net/rocker/rocker_hw.h
    A hw/net/rocker/rocker_of_dpa.c
    A hw/net/rocker/rocker_of_dpa.h
    A hw/net/rocker/rocker_tlv.h
    A hw/net/rocker/rocker_world.c
    A hw/net/rocker/rocker_world.h
    M hw/net/virtio-net.c
    M include/hw/pci/pci.h
    M include/hw/pci/pci_ids.h
    M include/net/net.h
    M net/net.c
    A tests/rocker/README
    A tests/rocker/all
    A tests/rocker/bridge
    A tests/rocker/bridge-stp
    A tests/rocker/bridge-vlan
    A tests/rocker/bridge-vlan-stp
    A tests/rocker/port
    A tests/rocker/tut.dot

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into 
staging

# gpg: Signature made Mon May 11 16:25:58 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/net-pull-request:
  rocker: timestamp on the debug logs helps correlate with events in the VM
  MAINTAINERS: add rocker
  rocker: add tests
  rocker: add new rocker switch device
  pci: add network device class 'other' for network switches
  pci: add rocker device ID
  rocker: add register programming guide
  virtio-net: use qemu_mac_strdup_printf
  net: add MAC address string printer

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/704eb1c09963...19fbe5084c1d
reply via email to
[Prev in Thread] Current Thread [Next in Thread]