Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2016-03-16' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 16 Mar 2016 10:38:14 +0000 (10:38 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 16 Mar 2016 10:38:15 +0000 (10:38 +0000)
commitcad0b273e58842fa9d06f5b53d588fbe5e146852
treefde7c1eb02a6af6e7da9f2d0258916ad8d88f1cb
parentf235538e38f45f010be9f16834273c2143e0cc77
parent588c36cac7a658758b3e0b60bfd62ebc2e4045c6
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2016-03-16' into staging

Monitor patches for 2016-03-16

# gpg: Signature made Wed 16 Mar 2016 09:47:23 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-monitor-2016-03-16:
  qdev-monitor: add missing aliases for virtio device classes
  qdev-monitor: sort alias table by typename
  qdev-monitor: improve error message when alias device is unavailable

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