On 07/03/2012 07:52 AM, Orit Wasserman wrote: > Signed-off-by: Benoit Hudzia <benoit.hud...@sap.com> > Signed-off-by: Petter Svard <pett...@cs.umu.se> > Signed-off-by: Aidan Shribman <aidan.shrib...@sap.com> > Signed-off-by: Orit Wasserman <owass...@redhat.com>
>
> ##
> # @MigrationInfo
> @@ -282,13 +307,18 @@
> # status, only returned if status is 'active' and it is a block
> # migration
> #
> -# Since: 0.14.0
> +# @params: #optional a list describing all the migration capabilities state
s/@params/@capabilities/ to match the schema. also, since
'*capabilities' was added in an earlier patch, this portion of the
documentation should be rebased into that same patch.
> +++ b/qmp-commands.hx
> @@ -2093,18 +2093,28 @@ The main json-object contains the following:
> - "transferred": amount transferred (json-int)
> - "remaining": amount remaining (json-int)
> - "total": total (json-int)
> + - "duplicate": number of duplicated pages (json-int)
> + - "normal" : number of normal pages transferred (json-int)
> - "disk": only present if "status" is "active" and it is a block migration,
> it is a json-object with the following disk information (in bytes):
> - "transferred": amount transferred (json-int)
> - "remaining": amount remaining (json-int)
> - "total": total (json-int)
> +- "params": migration capabilites state
s/params/capabilities/, s/capabilites/capabilities/
> + - "xbzrle" : on/off (json-bool)
on/off is not a json-bool; furthermore, MigrationCapabilityInfo (patch
2/13) is documented as being { "capability":"xbzrle", "state":true }
rather than { "xbzrle":"on" }
> 1. Before the first migration
> -
> -> { "execute": "query-migrate" }
> -<- { "return": {} }
> +<- { "return": { "params" : { "xbzrle" : "off" } } }
which means this example does not match your code
>
> 2. Migration is done and has succeeded
>
> @@ -2122,6 +2132,7 @@ Examples:
> <- {
> "return":{
> "status":"active",
> + "params" : { "xbzrle" : "off" },
neither does this. Should be:
"capabilities": [ { "capability":"xbzrle", "state":false } ],
> @@ -2136,6 +2147,7 @@ Examples:
> <- {
> "return":{
> "status":"active",
> + "params" : { "xbzrle" : "off" },
and again
> "ram":{
> "total":1057024,
> "remaining":1053304,
> @@ -2149,6 +2161,28 @@ Examples:
> }
> }
>
> +5. Migration is being performed and XBZRLE is active:
> +
> +-> { "execute": "query-migrate" }
> +<- {
> + "return":{
> + "status":"active",
> + "params" : { "xbzrle" : "on" },
and again
--
Eric Blake ebl...@redhat.com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
