On Fri, May 29, 2015 at 07:01:45AM -0700, sfel...@gmail.com wrote: > From: Scott Feldman <sfel...@gmail.com> > > v3: > > Address review comments from Stefan Hajnoczi: > > - Add missing hw/net/rocker/qmp-norocker.c file. > - Add missing curly brackets to a for loop > > v2: > > Address some review comments by Stefan Hajnoczi: see individual patches for > v1->v2 changes. > > v1: > > Some rocker device updates we've been holding onto waiting for base rocker > device to be pulled into 2.4. David added support for the device to return > the > physical port name, which in turn can be used by the OS to name the interface. > I added a small change the bringe link up/down when port is enabled/disabled. > > The big addition is adding qmp/hmp support to rocker. This was included in > the > original rocker device patch set, but pulled as there where last-minute issues > with building on non-PCI targets. These issues have been addressed by > stubbing > out qmp/hmp support when rocker device is built for non-PCI targets. > > David Ahern (1): > rocker: Add support for phys name > > Scott Feldman (3): > rocker: update tests using hw-derived interface names > rocker: bring link up/down on PHY enable/disable > qmp/hmp: add rocker device support > > docs/specs/rocker.txt | 1 + > hmp-commands.hx | 24 ++++ > hmp.c | 303 +++++++++++++++++++++++++++++++++++++++ > hmp.h | 4 + > hw/net/Makefile.objs | 1 + > hw/net/rocker/qmp-norocker.c | 50 +++++++ > hw/net/rocker/rocker.c | 68 ++++++++- > hw/net/rocker/rocker_fp.c | 29 +++- > hw/net/rocker/rocker_fp.h | 2 + > hw/net/rocker/rocker_hw.h | 1 + > hw/net/rocker/rocker_of_dpa.c | 312 > +++++++++++++++++++++++++++++++++++++++++ > monitor.c | 28 ++++ > qapi-schema.json | 3 + > qapi/rocker.json | 286 +++++++++++++++++++++++++++++++++++++ > qmp-commands.hx | 97 +++++++++++++ > tests/rocker/bridge | 25 ++-- > tests/rocker/bridge-stp | 25 ++-- > tests/rocker/bridge-vlan | 37 +++-- > tests/rocker/bridge-vlan-stp | 37 +++-- > tests/rocker/port | 8 +- > 20 files changed, 1263 insertions(+), 78 deletions(-) > create mode 100644 hw/net/rocker/qmp-norocker.c > create mode 100644 qapi/rocker.json
Thanks, applied to my master tree: https://github.com/stefanha/qemu/commits/master Stefan
pgpJ6AybTyGed.pgp
Description: PGP signature
