• Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 7263a903
    Peter Maydell authored
    pc, pci, virtio: new features, cleanups, fixes
    
    Beginning of reconnect support for vhost-user.
    Misc cleanups and fixes.
    Signed-off-by: 's avatarMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Fri 17 Jun 2016 01:28:39 BST
    # gpg:                using RSA key 0x281F0DB8D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
    # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
    #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
    
    * remotes/mst/tags/for_upstream:
      MAINTAINERS: add Marcel to PCI
      msi_init: change return value to 0 on success
      fix some coding style problems
      pci core: assert ENOSPC when add capability
      test: start vhost-user reconnect test
      tests: append i386 tests
      vhost-net: save & restore vring enable state
      vhost-net: save & restore vhost-user acked features
      vhost-net: do not crash if backend is not present
      vhost-user: disconnect on start failure
      qemu-char: add qemu_chr_disconnect to close a fd accepted by listen fd
      tests/vhost-user-bridge: workaround stale vring base
      tests/vhost-user-bridge: add client mode
      vhost-user: add ability to know vhost-user backend disconnection
      pci: fix pci_requester_id()
    Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    
    Conflicts:
    	tests/Makefile.include
    7263a903
Name
Last commit
Last update
..
Makefile.objs Loading commit data...
checksum.c Loading commit data...
clients.h Loading commit data...
dump.c Loading commit data...
eth.c Loading commit data...
filter-buffer.c Loading commit data...
filter-mirror.c Loading commit data...
filter.c Loading commit data...
hub.c Loading commit data...
hub.h Loading commit data...
l2tpv3.c Loading commit data...
net.c Loading commit data...
netmap.c Loading commit data...
queue.c Loading commit data...
slirp.c Loading commit data...
socket.c Loading commit data...
tap-aix.c Loading commit data...
tap-bsd.c Loading commit data...
tap-haiku.c Loading commit data...
tap-linux.c Loading commit data...
tap-linux.h Loading commit data...
tap-solaris.c Loading commit data...
tap-win32.c Loading commit data...
tap.c Loading commit data...
tap_int.h Loading commit data...
util.c Loading commit data...
util.h Loading commit data...
vde.c Loading commit data...
vhost-user.c Loading commit data...