File f4bdd829-rename-precopy-bandwidth.patch of Package libvirt.11700
commit f4bdd829772efcfdfff75a08d3b10609ffec6505
Author: Jiri Denemark <jdenemar@redhat.com>
Date: Mon Sep 2 17:00:32 2019 +0200
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@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Index: libvirt-5.1.0/tools/virsh-domain.c
===================================================================
--- libvirt-5.1.0.orig/tools/virsh-domain.c
+++ libvirt-5.1.0/tools/virsh-domain.c
@@ -10562,9 +10562,9 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_INT,
.help = N_("post-copy migration bandwidth limit in MiB/s")
},
- {.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}
};
@@ -10771,7 +10771,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(¶ms, &nparams, &maxparams,
Index: libvirt-5.1.0/tools/virsh.pod
===================================================================
--- libvirt-5.1.0.orig/tools/virsh.pod
+++ libvirt-5.1.0/tools/virsh.pod
@@ -1905,7 +1905,7 @@ I<domain> I<desturi> [I<migrateuri>] [I<
[I<--comp-xbzrle-cache>] [I<--auto-converge>] [I<auto-converge-initial>]
[I<auto-converge-increment>] [I<--persistent-xml> B<file>] [I<--tls>]
[I<--postcopy-bandwidth> B<bandwidth>]
-[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>
@@ -1938,7 +1938,7 @@ I<--postcopy-after-precopy> along with I
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