Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging master
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Feb 2015 12:16:46 +0000 (12:16 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Feb 2015 12:16:46 +0000 (12:16 +0000)
commit041ccc922ee474693a2869d4e3b59e920c739bc0
tree36b046a650b26079b3cbf634ee9ae8fe19384319
parent2559db069628981bfdc90637fac5bf1b4f4e8ef5
parent912ae9c88669d0a0cbae1f20b8c80dde8e526251
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  qapi-types: add C99 index names to arrays
  monitor: Fix missing err = NULL in client_migrate_info()
  balloon: Fix typo
  hmp: Fix warning from smatch (wrong argument in function call)

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