mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-07 03:29:37 +00:00
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>
This commit is contained in:
commit
178ac111bc
|
@ -691,7 +691,7 @@
|
||||||
# Information about current migration process.
|
# Information about current migration process.
|
||||||
#
|
#
|
||||||
# @status: #optional string describing the current migration status.
|
# @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
|
# 'cancelled'. If this field is not returned, no migration process
|
||||||
# has been initiated
|
# has been initiated
|
||||||
#
|
#
|
||||||
|
|
|
@ -2940,7 +2940,7 @@ block migration status.
|
||||||
The main json-object contains the following:
|
The main json-object contains the following:
|
||||||
|
|
||||||
- "status": migration status (json-string)
|
- "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
|
- "total-time": total amount of ms since migration started. If
|
||||||
migration has ended, it returns the total migration
|
migration has ended, it returns the total migration
|
||||||
time (json-int)
|
time (json-int)
|
||||||
|
|
|
@ -111,7 +111,7 @@ def gen_visitor_input_vars_decl(args):
|
||||||
argname=c_var(argname), argtype=c_type(argtype))
|
argname=c_var(argname), argtype=c_type(argtype))
|
||||||
else:
|
else:
|
||||||
ret += mcgen('''
|
ret += mcgen('''
|
||||||
%(argtype)s %(argname)s;
|
%(argtype)s %(argname)s = {0};
|
||||||
''',
|
''',
|
||||||
argname=c_var(argname), argtype=c_type(argtype))
|
argname=c_var(argname), argtype=c_type(argtype))
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ def __init__(self, fp, input_relname=None, include_hist=[],
|
||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
fobj = open(include_path, 'r')
|
fobj = open(include_path, 'r')
|
||||||
except IOError as e:
|
except IOError, e:
|
||||||
raise QAPIExprError(expr_info,
|
raise QAPIExprError(expr_info,
|
||||||
'%s: %s' % (e.strerror, include))
|
'%s: %s' % (e.strerror, include))
|
||||||
exprs_include = QAPISchema(fobj, include, self.include_hist,
|
exprs_include = QAPISchema(fobj, include, self.include_hist,
|
||||||
|
|
Loading…
Reference in a new issue