summary refs log tree commit diff stats
path: root/hw/timer/grlib_gptimer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-13 21:50:39 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-13 21:50:40 +0000
commitb19fc63cadb2815d5bcb1ec25b22849e455cbb31 (patch)
tree2b673750f06a40b9e78d5ed8142e6f8e49936a93 /hw/timer/grlib_gptimer.c
parent90c5d39cb847d7f360454950be647cd83cacea58 (diff)
parent01c22f2cdd4fcf02276ea10f48253850a5fd7259 (diff)
downloadfocaccia-qemu-b19fc63cadb2815d5bcb1ec25b22849e455cbb31.tar.gz
focaccia-qemu-b19fc63cadb2815d5bcb1ec25b22849e455cbb31.zip
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>
Diffstat (limited to 'hw/timer/grlib_gptimer.c')
0 files changed, 0 insertions, 0 deletions