Commit 178ac111 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6054d883 fc13d937

qapi-schema.json

+1 −1
Original line number Diff line number Diff line
@@ -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

#

qmp-commands.hx

+1 −1
Original line number Diff line number Diff line
@@ -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)

scripts/qapi-commands.py

+1 −1
Original line number Diff line number Diff line
@@ -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))

scripts/qapi.py

+1 −1
Original line number Diff line number Diff line
@@ -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,