Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
commit0f2fa73ba0ca19ebdaccf0d1785583d6601411b6
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Sep 2016 10:23:20 +0000 (19 11:23 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Sep 2016 10:23:20 +0000 (19 11:23 +0100)
treeb3e48e62a82daeec5420191f2fe70b92f5341798
parente3571ae30cd26d19efd4554c25e32ef64d6a36b3
parent6bd7776cd0a9581cdb5e9dd40df8821a96e355d6
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
MAINTAINERS
include/hw/virtio/virtio-bus.h