Re: [Qemu-devel] [PATCH 04/17] qmp-command.hx: add missing docs for migration capabilites

[Paolo Bonzini <pbonzini@redhat.com>]

Il 22/10/2013 04:25, Lei Li ha scritto:
> Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
> ---
>  qmp-commands.hx |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index fba15cd..650a3a8 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -2898,6 +2898,10 @@ migrate-set-capabilities
>  Enable/Disable migration capabilities
>  
>  - "xbzrle": XBZRLE support
> +- "x-rdma-pin-all": RDMA support

Pin all pages during RDMA support.

> +- "zero-blocks": zero-blocks support

Compress zero blocks during block migration.

> +- "auto-converge": Auto converge support

Block VCPU to help convergence of migration

> +- "unix-page-flipping": Page flipping support

Page flipping for live QEMU upgrade

>  Arguments:
>  
> @@ -2922,6 +2926,10 @@ Query current migration capabilities
>  
>  - "capabilities": migration capabilities state
>           - "xbzrle" : XBZRLE state (json-bool)
> +         - "x-rdma-pin-all": RDMA state (json-bool)
> +         - "zero-blocks": zero-blocks state (json-bool)
> +         - "auto-converge": Auto converge state (json-bool)
> +         - "unix-page-flipping": Page flipping state (json-bool)
>  
>  Arguments:
>  
> 

Please separate page flipping in a separate patch and send it for 1.7.
Once you do that, patches 2/3/4 can be merged.

Paolo