]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 22 May 2014 18:04:48 +0000 (19:04 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 22 May 2014 18:04:49 +0000 (19:04 +0100)
commit178ac111bca16c08a79b2609ebdc75197bea976a
treed71997ac5687bf97ca2477f8f54e2edced71d2a6
parent6054d883d6138bfc92c73a7c090c824b64086fd2
parentfc13d937269c1cd01a4b7720c1dcce01722727a2
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  qapi: zero-initialize all QMP command parameters
  scripts/qapi.py: Avoid syntax not supported by Python 2.4
  doc: add "setup" to list of migration states

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
qapi-schema.json
qmp-commands.hx