From: Peter Maydell Date: Fri, 30 Oct 2015 09:41:14 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-30' into staging X-Git-Tag: v2.5.0-rc0~40 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fdf927621a99711bf1a81712bce054794f2d44c3;p=qemu-xen-unstable.git Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-30' into staging QMP and QObject patches # gpg: Signature made Fri 30 Oct 2015 08:06:26 GMT using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-monitor-2015-10-30: docs: Document QMP event rate limiting monitor: Throttle event VSERPORT_CHANGE separately by "id" monitor: Turn monitor_qapi_event_state[] into a hash table glib: add compatibility interface for g_hash_table_add() monitor: Split MonitorQAPIEventConf off MonitorQAPIEventState monitor: Switch from timer_new() to timer_new_ns() monitor: Simplify event throttling monitor: Reduce casting of QAPI event QDict qstring: Make conversion from QObject * accept null qlist: Make conversion from QObject * accept null qfloat qint: Make conversion from QObject * accept null qdict: Make conversion from QObject * accept null qbool: Make conversion from QObject * accept null qobject: Drop QObject_HEAD Signed-off-by: Peter Maydell --- fdf927621a99711bf1a81712bce054794f2d44c3