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 <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* 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 <peter.maydell@linaro.org>
No related branches found
No related tags found
Showing
- docs/qmp-events.txt 12 additions, 0 deletionsdocs/qmp-events.txt
- docs/qmp-spec.txt 5 additions, 0 deletionsdocs/qmp-spec.txt
- include/glib-compat.h 8 additions, 0 deletionsinclude/glib-compat.h
- include/qapi/qmp/qbool.h 1 addition, 1 deletioninclude/qapi/qmp/qbool.h
- include/qapi/qmp/qdict.h 1 addition, 1 deletioninclude/qapi/qmp/qdict.h
- include/qapi/qmp/qfloat.h 1 addition, 1 deletioninclude/qapi/qmp/qfloat.h
- include/qapi/qmp/qint.h 1 addition, 1 deletioninclude/qapi/qmp/qint.h
- include/qapi/qmp/qlist.h 1 addition, 1 deletioninclude/qapi/qmp/qlist.h
- include/qapi/qmp/qobject.h 0 additions, 4 deletionsinclude/qapi/qmp/qobject.h
- include/qapi/qmp/qstring.h 1 addition, 1 deletioninclude/qapi/qmp/qstring.h
- monitor.c 112 additions, 80 deletionsmonitor.c
- qapi/qmp-input-visitor.c 20 additions, 16 deletionsqapi/qmp-input-visitor.c
- qga/main.c 3 additions, 8 deletionsqga/main.c
- qobject/qbool.c 2 additions, 2 deletionsqobject/qbool.c
- qobject/qdict.c 12 additions, 27 deletionsqobject/qdict.c
- qobject/qfloat.c 2 additions, 2 deletionsqobject/qfloat.c
- qobject/qint.c 2 additions, 2 deletionsqobject/qint.c
- qobject/qlist.c 1 addition, 2 deletionsqobject/qlist.c
- qobject/qstring.c 2 additions, 2 deletionsqobject/qstring.c
- trace-events 2 additions, 2 deletionstrace-events
Loading
Please register or sign in to comment