From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 13 Mar 2014 21:50:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~109
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b19fc63cadb2815d5bcb1ec25b22849e455cbb31;p=qemu-upstream-4.5-testing.git

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging

QOM/QTest infrastructure fixes

* QOM cast fix for virtserialport and regression test
* QTest error handling fix
* QTest output cleanup

# gpg: Signature made Thu 13 Mar 2014 20:43:34 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-2.0:
  main-loop: Suppress "I/O thread spun" warnings for qtest
  qtest: Fix crash if SIGABRT during qtest_init()
  virtio-console-test: Test virtserialport as well
  virtio-console: Fix VIRTIO_CONSOLE() cast macro

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

b19fc63cadb2815d5bcb1ec25b22849e455cbb31