From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 19 Sep 2016 10:23:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0f2fa73ba0ca19ebdaccf0d1785583d6601411b6;p=qemu.git

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
---

0f2fa73ba0ca19ebdaccf0d1785583d6601411b6
diff --cc MAINTAINERS
index 7d43026162,0e0c326f55..e1d458933f
--- a/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