| Message ID | 1446129134-26379-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 29 October 2015 at 14:32, Markus Armbruster <armbru@redhat.com> wrote: > The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce: > > Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-10-29 09:49:52 +0000) > > are available in the git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-10-29 > > for you to fetch changes up to f6724b5b1b8fb1ca76b3df10d80415c206e2c4b9: > > docs: Document QMP event rate limiting (2015-10-29 14:37:34 +0100) > > ---------------------------------------------------------------- > QMP and QObject patches > Still doesn't build with old glib: In file included from /Users/pm215/src/qemu-for-merges/qga/commands.c:14: In file included from /Users/pm215/src/qemu-for-merges/qga/guest-agent-core.h:14: In file included from /Users/pm215/src/qemu-for-merges/include/qemu-common.h:25: /Users/pm215/src/qemu-for-merges/include/glib-compat.h:172:47: error: expected ';' after expression g_hash_table_replace(hash_table, key, key) ^ ; I did a trial build with the typo fixed, and that is OK, so this should be the last fix required, I think. thanks -- PMM
Peter Maydell <peter.maydell@linaro.org> writes: > On 29 October 2015 at 14:32, Markus Armbruster <armbru@redhat.com> wrote: >> The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce: >> >> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into >> staging (2015-10-29 09:49:52 +0000) >> >> are available in the git repository at: >> >> git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-10-29 >> >> for you to fetch changes up to f6724b5b1b8fb1ca76b3df10d80415c206e2c4b9: >> >> docs: Document QMP event rate limiting (2015-10-29 14:37:34 +0100) >> >> ---------------------------------------------------------------- >> QMP and QObject patches >> > > Still doesn't build with old glib: > > In file included from /Users/pm215/src/qemu-for-merges/qga/commands.c:14: > In file included from > /Users/pm215/src/qemu-for-merges/qga/guest-agent-core.h:14: > In file included from /Users/pm215/src/qemu-for-merges/include/qemu-common.h:25: > /Users/pm215/src/qemu-for-merges/include/glib-compat.h:172:47: error: > expected ';' after expression > g_hash_table_replace(hash_table, key, key) > ^ > ; > > I did a trial build with the typo fixed, and that is OK, so this > should be the last fix required, I think. Hand me the brown paper bag...
On 10/29/2015 12:33 PM, Markus Armbruster wrote: >> Still doesn't build with old glib: >> >> In file included from /Users/pm215/src/qemu-for-merges/qga/commands.c:14: >> In file included from >> /Users/pm215/src/qemu-for-merges/qga/guest-agent-core.h:14: >> In file included from /Users/pm215/src/qemu-for-merges/include/qemu-common.h:25: >> /Users/pm215/src/qemu-for-merges/include/glib-compat.h:172:47: error: >> expected ';' after expression >> g_hash_table_replace(hash_table, key, key) >> ^ >> ; >> >> I did a trial build with the typo fixed, and that is OK, so this >> should be the last fix required, I think. > > Hand me the brown paper bag... And me, for letting that slip by review even when I caught 'add (' on the line above.
Peter Maydell <peter.maydell@linaro.org> writes: > On 29 October 2015 at 14:32, Markus Armbruster <armbru@redhat.com> wrote: >> The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce: >> >> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into >> staging (2015-10-29 09:49:52 +0000) >> >> are available in the git repository at: >> >> git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-10-29 >> >> for you to fetch changes up to f6724b5b1b8fb1ca76b3df10d80415c206e2c4b9: >> >> docs: Document QMP event rate limiting (2015-10-29 14:37:34 +0100) >> >> ---------------------------------------------------------------- >> QMP and QObject patches >> > > Still doesn't build with old glib: > > In file included from /Users/pm215/src/qemu-for-merges/qga/commands.c:14: > In file included from > /Users/pm215/src/qemu-for-merges/qga/guest-agent-core.h:14: > In file included from /Users/pm215/src/qemu-for-merges/include/qemu-common.h:25: > /Users/pm215/src/qemu-for-merges/include/glib-compat.h:172:47: error: > expected ';' after expression > g_hash_table_replace(hash_table, key, key) > ^ > ; > > I did a trial build with the typo fixed, and that is OK, so this > should be the last fix required, I think. I fixed up this line, pushed, and sent a PULL v4 cover letter. Sorry for the extra iterations.
The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-10-29 09:49:52 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-10-29 for you to fetch changes up to f6724b5b1b8fb1ca76b3df10d80415c206e2c4b9: docs: Document QMP event rate limiting (2015-10-29 14:37:34 +0100) ---------------------------------------------------------------- QMP and QObject patches ---------------------------------------------------------------- Markus Armbruster (14): qobject: Drop QObject_HEAD qbool: Make conversion from QObject * accept null qdict: Make conversion from QObject * accept null qfloat qint: Make conversion from QObject * accept null qlist: Make conversion from QObject * accept null qstring: Make conversion from QObject * accept null monitor: Reduce casting of QAPI event QDict monitor: Simplify event throttling monitor: Switch from timer_new() to timer_new_ns() monitor: Split MonitorQAPIEventConf off MonitorQAPIEventState glib: add compatibility interface for g_hash_table_add() monitor: Turn monitor_qapi_event_state[] into a hash table monitor: Throttle event VSERPORT_CHANGE separately by "id" docs: Document QMP event rate limiting docs/qmp-events.txt | 12 +++ docs/qmp-spec.txt | 5 ++ include/glib-compat.h | 8 ++ include/qapi/qmp/qbool.h | 2 +- include/qapi/qmp/qdict.h | 2 +- include/qapi/qmp/qfloat.h | 2 +- include/qapi/qmp/qint.h | 2 +- include/qapi/qmp/qlist.h | 2 +- include/qapi/qmp/qobject.h | 4 - include/qapi/qmp/qstring.h | 2 +- monitor.c | 192 ++++++++++++++++++++++++++------------------- qapi/qmp-input-visitor.c | 40 +++++----- qga/main.c | 11 +-- qobject/qbool.c | 4 +- qobject/qdict.c | 39 +++------ qobject/qfloat.c | 4 +- qobject/qint.c | 4 +- qobject/qlist.c | 3 +- qobject/qstring.c | 4 +- trace-events | 4 +- 20 files changed, 191 insertions(+), 155 deletions(-)