Message ID | 1400251247-11218-1-git-send-email-peter@gridcentric.ca |
---|---|
State | New |
Headers | show |
On 05/16/2014 08:40 AM, peter@gridcentric.ca wrote: > From: Peter Feiner <peter@gridcentric.ca> > > On a slow VM (e.g., nested), you see the "setup" state when you query the > migration status. > > Signed-off-by: Peter Feiner <peter@gridcentric.ca> > --- > qapi-schema.json | 2 +- > qmp-commands.hx | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > diff --git a/qapi-schema.json b/qapi-schema.json > index 36cb964..f4ffede 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 You know, it would be even nicer to convert from an open-coded 'str' to a finite enum of valid strings; it would be self-documenting, and make it that much easier to guarantee the code doesn't add new states without documenting when they were added.
On Fri, 16 May 2014 10:40:47 -0400 peter@gridcentric.ca wrote: > From: Peter Feiner <peter@gridcentric.ca> > > On a slow VM (e.g., nested), you see the "setup" state when you query the > migration status. > > Signed-off-by: Peter Feiner <peter@gridcentric.ca> Applied to the qmp branch, thanks. > --- > qapi-schema.json | 2 +- > qmp-commands.hx | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 36cb964..f4ffede 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 cae890e..408ae9c 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -2937,7 +2937,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/qapi-schema.json b/qapi-schema.json index 36cb964..f4ffede 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 cae890e..408ae9c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2937,7 +2937,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)