[Qemu-devel] [PULL 00/16] Net patches

[Stefan Hajnoczi]

The following changes since commit d8e3b729cf452d2689c8669f1ec18158db29fd5a:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 
(2015-06-11 15:33:38 +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 fafa4d508b42a70a59a6bd647a2c0cfad86246c3:

  qmp/hmp: add rocker device support (2015-06-12 13:42:17 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

David Ahern (1):
  rocker: Add support for phys name

Fam Zheng (12):
  stubs: Add qemu_set_fd_handler
  l2tpv3: Drop l2tpv3_can_send
  netmap: Drop netmap_can_send
  net/socket: Drop net_socket_can_send
  tap: Drop tap_can_send
  Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler
  main-loop: Drop qemu_set_fd_handler2
  alsaaudio: Remove unused error handling of qemu_set_fd_handler
  oss: Remove unused error handling of qemu_set_fd_handler
  xen_backend: Remove unused error handling of qemu_set_fd_handler
  event-notifier: Always return 0 for posix implementation
  iohandler: Change return type of qemu_set_fd_handler to "void"

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

 audio/alsaaudio.c             |  16 +--
 audio/ossaudio.c              |  14 +-
 blockdev-nbd.c                |   4 +-
 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 ++++++++++++++++++++++++++++++++++++++++++
 hw/xen/xen_backend.c          |   4 +-
 include/block/aio.h           |   2 +-
 include/qemu/main-loop.h      |  57 +-------
 iohandler.c                   |  21 +--
 main-loop.c                   |   3 +-
 migration/exec.c              |   6 +-
 migration/fd.c                |   4 +-
 migration/rdma.c              |   7 +-
 migration/tcp.c               |   6 +-
 migration/unix.c              |   6 +-
 monitor.c                     |  28 ++++
 net/l2tpv3.c                  |  17 +--
 net/netmap.c                  |  20 +--
 net/socket.c                  |  37 +++--
 net/tap.c                     |  19 +--
 qapi-schema.json              |   3 +
 qapi/rocker.json              | 286 ++++++++++++++++++++++++++++++++++++++
 qmp-commands.hx               | 103 ++++++++++++++
 stubs/set-fd-handler.c        |   3 +-
 tests/rocker/bridge           |  25 ++--
 tests/rocker/bridge-stp       |  25 ++--
 tests/rocker/bridge-vlan      |  37 +++--
 tests/rocker/bridge-vlan-stp  |  37 +++--
 tests/rocker/port             |   8 +-
 ui/vnc-auth-sasl.c            |   2 +-
 ui/vnc-auth-vencrypt.c        |   2 +-
 ui/vnc-ws.c                   |   6 +-
 ui/vnc.c                      |  27 ++--
 util/event_notifier-posix.c   |   3 +-
 util/qemu-sockets.c           |   8 +-
 44 files changed, 1364 insertions(+), 277 deletions(-)
 create mode 100644 hw/net/rocker/qmp-norocker.c
 create mode 100644 qapi/rocker.json

-- 
2.4.2