[libvirt] [PATCH] Allow blkdeviotune to take human readable values

Use vshCommandOptScaledInt instead of vshCommandOptULongLong so there is no need to pass values in raw bytes, which is seldom the case. --- tools/virsh-domain.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0a6caae..3843675 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1299,7 +1299,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "device", &disk) < 0) goto cleanup; - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1308,7 +1308,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1317,7 +1317,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1326,7 +1326,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1335,7 +1335,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1344,7 +1344,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1353,7 +1353,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1362,7 +1362,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1371,7 +1371,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1380,7 +1380,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-iops-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-iops-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1389,7 +1389,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-iops-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-iops-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1398,7 +1398,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-iops-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-iops-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1407,7 +1407,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "size-iops-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "size-iops-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, -- 2.1.4