diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c24710231e41144de3600056a82b260c207f84ce..b18ac32b4773d94412b5a8c528c16c97ecd51772 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2010,6 +2010,10 @@ static const vshCmdOptDef opts_block_commit[] = { .type = VSH_OT_BOOL, .help = N_("keep the backing chain relatively referenced") }, + {.name = "bytes", + .type = VSH_OT_BOOL, + .help = N_("the bandwidth limit is in bytes/s rather than MiB/s") + }, {.name = NULL} }; @@ -2024,6 +2028,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) bool active = vshCommandOptBool(cmd, "active") || pivot || finish; bool blocking = vshCommandOptBool(cmd, "wait") || pivot || finish; bool async = vshCommandOptBool(cmd, "async"); + bool bytes = vshCommandOptBool(cmd, "bytes"); int timeout = 0; const char *path = NULL; const char *base = NULL; @@ -2044,9 +2049,12 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "top", &top) < 0) return false; - if (vshCommandOptULWrap(ctl, cmd, "bandwidth", &bandwidth) < 0) + if (vshBlockJobOptionBandwidth(ctl, cmd, bytes, &bandwidth) < 0) return false; + if (bytes) + flags |= VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES; + if (vshCommandOptBool(cmd, "shallow")) flags |= VIR_DOMAIN_BLOCK_COMMIT_SHALLOW; diff --git a/tools/virsh.pod b/tools/virsh.pod index eb4e14775258883af88e89e64088af31c170415b..a1808acf433f424236e5e3618b875321d569939a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -941,7 +941,7 @@ currently in use by a running domain. Other contexts that require a MAC address of virtual interface (such as I or I) will accept the MAC address printed by this command. -=item B I I [I] +=item B I I [I] [I<--bytes>] [I] [I<--shallow>] [I] [I<--delete>] [I<--keep-relative>] [I<--wait> [I<--async>] [I<--verbose>]] [I<--timeout> B] [I<--active>] [{I<--pivot> | I<--keep-overlay>}] @@ -987,10 +987,9 @@ to a unique target name () or source file () for one of the disk devices attached to I (see also B for listing these names). I specifies copying bandwidth limit in MiB/s, although for -qemu, it may be non-zero only for an online domain. Specifying a negative -value is interpreted as an unsigned long long value or essentially -unlimited. The hypervisor can choose whether to reject the value or -convert it to the maximum value allowed. +qemu, it may be non-zero only for an online domain. For further information +on the I argument see the corresponding section for the B +command. =item B I I { I [I] [I<--blockdev>] | I<--xml> B } [I<--shallow>] [I<--reuse-external>] [I]