aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-05-22 19:04:48 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-05-22 19:04:49 +0100
commit178ac111bca16c08a79b2609ebdc75197bea976a (patch)
treed71997ac5687bf97ca2477f8f54e2edced71d2a6
parent6054d883d6138bfc92c73a7c090c824b64086fd2 (diff)
parentfc13d937269c1cd01a4b7720c1dcce01722727a2 (diff)
downloadqemu-arm-178ac111bca16c08a79b2609ebdc75197bea976a.tar.gz
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>
-rw-r--r--qapi-schema.json2
-rw-r--r--qmp-commands.hx2
-rw-r--r--scripts/qapi-commands.py2
-rw-r--r--scripts/qapi.py2
4 files changed, 4 insertions, 4 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
#
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 2c53c1ba2e..d8aa4edabe 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2940,7 +2940,7 @@ block migration status.
The main json-object contains the following:
- "status": migration status (json-string)
- - Possible values: "active", "completed", "failed", "cancelled"
+ - Possible values: "setup", "active", "completed", "failed", "cancelled"
- "total-time": total amount of ms since migration started. If
migration has ended, it returns the total migration
time (json-int)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 386f17ef44..7d93d01ed2 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -111,7 +111,7 @@ bool has_%(argname)s = false;
argname=c_var(argname), argtype=c_type(argtype))
else:
ret += mcgen('''
-%(argtype)s %(argname)s;
+%(argtype)s %(argname)s = {0};
''',
argname=c_var(argname), argtype=c_type(argtype))
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 0265b404dd..86e96089af 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -116,7 +116,7 @@ class QAPISchema:
continue
try:
fobj = open(include_path, 'r')
- except IOError as e:
+ except IOError, e:
raise QAPIExprError(expr_info,
'%s: %s' % (e.strerror, include))
exprs_include = QAPISchema(fobj, include, self.include_hist,