tree d71997ac5687bf97ca2477f8f54e2edced71d2a6
parent 6054d883d6138bfc92c73a7c090c824b64086fd2
parent fc13d937269c1cd01a4b7720c1dcce01722727a2
author Peter Maydell <peter.maydell@linaro.org> 1400781888 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1400781889 +0100

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>