[libvirt] [PATCH v2 2/2] doc: improve the documentation of desturi

[Daniel P. Berrange]

On Wed, Jan 12, 2011 at 02:12:39PM +0800, Wen Congyang wrote:
> 
> Signed-off-by: Wen Congyang <wency at cn.fujitsu.com>
> 
> ---
>  tools/virsh.c   |    2 +-
>  tools/virsh.pod |   13 +++++++++++++
>  2 files changed, 14 insertions(+), 1 deletions(-)
> 
> diff --git a/tools/virsh.c b/tools/virsh.c
> index 55e2a68..018e363 100644
> --- a/tools/virsh.c
> +++ b/tools/virsh.c
> @@ -3375,7 +3375,7 @@ static const vshCmdOptDef opts_migrate[] = {
>      {"copy-storage-all", VSH_OT_BOOL, 0, N_("migration with non-shared storage with full disk copy")},
>      {"copy-storage-inc", VSH_OT_BOOL, 0, N_("migration with non-shared storage with incremental copy (same base image shared between source and destination)")},
>      {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
> -    {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, N_("connection URI of the destination host")},
> +    {"desturi", VSH_OT_DATA, VSH_OFLAG_REQ, N_("connection URI of the destination host as seen from the client(normal migration) or source(p2p migration)")},
>      {"migrateuri", VSH_OT_DATA, 0, N_("migration URI, usually can be omitted")},
>      {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")},
>      {NULL, 0, 0, NULL}
> diff --git a/tools/virsh.pod b/tools/virsh.pod
> index 9c45a61..0e03d68 100644
> --- a/tools/virsh.pod
> +++ b/tools/virsh.pod
> @@ -505,6 +505,19 @@ I<migrateuri> is the migration URI, which usually can be omitted.
>  I<dname> is used for renaming the domain to new name during migration, which
>  also usually can be omitted.
>  
> +B<Note>: The I<desturi> parameter for normal migration and peer2peer migration
> +has different semantics:
> +
> +=over 4
> +
> +=item * normal migration: the I<desturi> is an address of the target host as
> +seen from the client machine.
> +
> +=item * peer2peer migration: the I<desturi> is an address of the target host as
> +seen from the source machine.
> +
> +=back
> +
>  =item B<migrate-setmaxdowntime> I<domain-id> I<downtime>
>  
>  Set maximum tolerable downtime for a domain which is being live-migrated to

ACK


Daniel