From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 30 Jun 2014 14:56:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~339
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ec9fe956d5c728da770db5ec9bc429080ccb5043;p=qemu-upstream-4.6-testing.git

Merge remote-tracking branch 'remotes/bonzini/small-fixes' into staging

* remotes/bonzini/small-fixes:
  tests/test-qmp-event: fix for GLib < 2.31
  serial: poll the serial console with G_IO_HUP

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

ec9fe956d5c728da770db5ec9bc429080ccb5043