• P
    Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging · 0a2df857
    Peter Maydell 提交于
    # gpg: Signature made Fri Jun 12 13:57:20 2015 BST using RSA key ID 81AB73C8
    # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
    # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
    
    * remotes/stefanha/tags/net-pull-request:
      qmp/hmp: add rocker device support
      rocker: bring link up/down on PHY enable/disable
      rocker: update tests using hw-derived interface names
      rocker: Add support for phys name
      iohandler: Change return type of qemu_set_fd_handler to "void"
      event-notifier: Always return 0 for posix implementation
      xen_backend: Remove unused error handling of qemu_set_fd_handler
      oss: Remove unused error handling of qemu_set_fd_handler
      alsaaudio: Remove unused error handling of qemu_set_fd_handler
      main-loop: Drop qemu_set_fd_handler2
      Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler
      tap: Drop tap_can_send
      net/socket: Drop net_socket_can_send
      netmap: Drop netmap_can_send
      l2tpv3: Drop l2tpv3_can_send
      stubs: Add qemu_set_fd_handler
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    0a2df857
rdma.c 102.9 KB