On Thu, Oct 06, 2016 at 06:38:59PM -0400, John Ferlan wrote:
Rework the repetitive lines to add iotune values into easier to read macro
Signed-off-by: John Ferlan <jferlan@redhat.com> --- tools/virsh-domain.c | 141 +++++++++------------------------------------------ 1 file changed, 25 insertions(+), 116 deletions(-)
[...]
+#define VSH_ADD_IOTUNE(PARAM, CONST) \ + if ((rv = vshCommandOptScaledInt(ctl, cmd, #PARAM, &value, \ + 1, ULLONG_MAX)) < 0) { \
Again a nitpick, I guess the -length setting should not get scaled when one tries e.g. 'kib' to pass along with the setting. In terms of a cleanup, yes, it's very welcome, so maybe add a 'SCALE' argument - your call. ACK Erik
+ goto interror; \ + } else if (rv > 0) { \ + if (virTypedParamsAddULLong(¶ms, &nparams, &maxparams, \ + VIR_DOMAIN_BLOCK_IOTUNE_##CONST, \ + value) < 0) \ + goto save_error; \ + } \ + + VSH_ADD_IOTUNE(total-bytes-sec, TOTAL_BYTES_SEC); + VSH_ADD_IOTUNE(read-bytes-sec, READ_BYTES_SEC); + VSH_ADD_IOTUNE(write-bytes-sec, WRITE_BYTES_SEC); + VSH_ADD_IOTUNE(total-iops-sec, TOTAL_IOPS_SEC); + VSH_ADD_IOTUNE(read-iops-sec, READ_IOPS_SEC); + VSH_ADD_IOTUNE(write-iops-sec, WRITE_IOPS_SEC); + + VSH_ADD_IOTUNE(total-bytes-sec-max, TOTAL_BYTES_SEC_MAX); + VSH_ADD_IOTUNE(read-bytes-sec-max, READ_BYTES_SEC_MAX); + VSH_ADD_IOTUNE(write-bytes-sec-max, WRITE_BYTES_SEC_MAX); + VSH_ADD_IOTUNE(total-iops-sec-max, TOTAL_IOPS_SEC_MAX); + VSH_ADD_IOTUNE(read-iops-sec-max, READ_IOPS_SEC_MAX); + VSH_ADD_IOTUNE(write-iops-sec-max, WRITE_IOPS_SEC_MAX); + VSH_ADD_IOTUNE(size-iops-sec, SIZE_IOPS_SEC);
if (nparams == 0) { if (virDomainGetBlockIoTune(dom, NULL, NULL, &nparams, flags) != 0) { -- 2.7.4
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list