]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
projects / qemu-xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6054d88 fc13d93)
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)
* 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>
1  2 
qapi-schema.json patch | diff1 | diff2 | blob | history
qmp-commands.hx patch | diff1 | diff2 | blob | history

diff --cc qapi-schema.json
Simple merge
diff --cc qmp-commands.hx
Simple merge
qemu-xen (upstream qemu) tree.