]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-30' into staging
authorPeter Maydell <[email protected]>
Fri, 30 Oct 2015 09:41:14 +0000 (09:41 +0000)
committerPeter Maydell <[email protected]>
Fri, 30 Oct 2015 09:41:15 +0000 (09:41 +0000)
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 <[email protected]>"
# gpg:                 aka "Markus Armbruster <[email protected]>"

* 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 <[email protected]>

Trivial merge
This page took 0.030255 seconds and 4 git commands to generate.