]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2559db0 912ae9c)
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
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)
* 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>
1  2 
hmp.c patch | diff1 | diff2 | blob | history
monitor.c patch | diff1 | diff2 | blob | history

diff --cc hmp.c
Simple merge
diff --cc monitor.c
Simple merge
QEMU mirror