Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc, pci, virtio: new features, cleanups, fixes

Beginning of reconnect support for vhost-user.
Misc cleanups and fixes.

Signed-off-by: Michael 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: Peter Maydell <peter.maydell@linaro.org>
Conflicts:
	tests/Makefile.include

diff --cc hw/i386/kvm/pci-assign.c
Simple merge

diff --cc qemu-char.c
Simple merge

diff --cc tests/Makefile.include
index 6135875c37f6b134182fde845a7faf9beb0de38e,4b4bfa593050e0bb5a8586b765d06754be45ba83..bf620b8dd40185d420f4b493a7cd8d72fcc76afc
--- 1/tests/Makefile.include
--- 2/tests/Makefile.include
+++ b/tests/Makefile.include
@@@ -234,8 -234,7 +234,8 @@@ endi
  check-qtest-i386-y += tests/test-netfilter$(EXESUF)
  check-qtest-i386-y += tests/test-filter-mirror$(EXESUF)
  check-qtest-i386-y += tests/test-filter-redirector$(EXESUF)
- check-qtest-x86_64-y = $(check-qtest-i386-y)
 +check-qtest-i386-y += tests/postcopy-test$(EXESUF)
+ check-qtest-x86_64-y += $(check-qtest-i386-y)
  gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
  gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
  check-qtest-mips-y = tests/endianness-test$(EXESUF)

diff --cc tests/vhost-user-bridge.c
Simple merge

diff --cc tests/vhost-user-test.c
Simple merge