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

virtio: fixes

virtio feature negotiation rework

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 16 Sep 2016 19:54:54 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 virtio-* tests
  virtio-bus: Plug devices after features are negotiated

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	MAINTAINERS

diff --cc MAINTAINERS
index 7d43026,0e0c326..e1d4589
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -907,6 -909,8 +910,7 @@@ L: qemu-block@nongnu.or
  S: Supported
  F: hw/block/virtio-blk.c
  F: hw/block/dataplane/*
 -F: hw/virtio/dataplane/*
+ F: tests/virtio-blk-test.c
  T: git git://github.com/stefanha/qemu.git block
  
  virtio-ccw

diff --cc include/hw/virtio/virtio-bus.h
Simple merge