From: Peter Maydell Date: Thu, 22 May 2014 18:04:48 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=178ac111bca16c08a79b2609ebdc75197bea976a;p=qemu.git 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 --- 178ac111bca16c08a79b2609ebdc75197bea976a