diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-22 19:04:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-22 19:04:49 +0100 |
| commit | 178ac111bca16c08a79b2609ebdc75197bea976a (patch) | |
| tree | d71997ac5687bf97ca2477f8f54e2edced71d2a6 /qapi-schema.json | |
| parent | 6054d883d6138bfc92c73a7c090c824b64086fd2 (diff) | |
| parent | fc13d937269c1cd01a4b7720c1dcce01722727a2 (diff) | |
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>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 70ed7e3b45..7bc33ea717 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -691,7 +691,7 @@ # Information about current migration process. # # @status: #optional string describing the current migration status. -# As of 0.14.0 this can be 'active', 'completed', 'failed' or +# As of 0.14.0 this can be 'setup', 'active', 'completed', 'failed' or # 'cancelled'. If this field is not returned, no migration process # has been initiated # |