[libvirt] [PATCH 1/2] virsh: Rename --precopy-bandwidth migration option

The (pre-copy) bandwidth was historically the only bandwidth we supported and thus it is called just "bandwidth" in all other places. E.g., virsh migrate-setspeed or in the migration typed parameter name. Let's make the new option for virsh migrate consistent. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tools/virsh-domain.c | 6 +++--- tools/virsh.pod | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 201fc176c7..3d26e81b22 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10587,9 +10587,9 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_INT, .help = N_("number of connections for parallel migration") }, - {.name = "precopy-bandwidth", + {.name = "bandwidth", .type = VSH_OT_INT, - .help = N_("pre-copy migration bandwidth limit in MiB/s") + .help = N_("migration bandwidth limit in MiB/s") }, {.name = NULL} }; @@ -10805,7 +10805,7 @@ doMigrate(void *opaque) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "precopy-bandwidth", &ullOpt)) < 0) { + if ((rv = vshCommandOptULongLong(ctl, cmd, "bandwidth", &ullOpt)) < 0) { goto out; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, diff --git a/tools/virsh.pod b/tools/virsh.pod index 0dc3216bc2..59fb4bfc2e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2153,7 +2153,7 @@ I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<dna [I<auto-converge-increment>] [I<--persistent-xml> B<file>] [I<--tls>] [I<--postcopy-bandwidth> B<bandwidth>] [I<--parallel> [I<--parallel-connections> B<connections>]] -[I<--precopy-bandwidth> B<bandwidth>] +[I<--bandwidth> B<bandwidth>] Migrate domain to another host. Add I<--live> for live migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> @@ -2186,7 +2186,7 @@ I<--postcopy-after-precopy> along with I<--postcopy> to let libvirt automatically switch to post-copy after the first pass of pre-copy is finished. The maximum bandwidth consumed during the post-copy phase may be limited using I<--postcopy-bandwidth>. The maximum bandwidth consumed during the pre-copy phase -may be limited using I<--precopy-bandwidth>. +may be limited using I<--bandwidth>. I<--auto-converge> forces convergence during live migration. The initial guest CPU throttling rate can be set with I<auto-converge-initial>. If the -- 2.23.0