[libvirt] [PATCH v3 1/4] cmdDomblkinfo: introduce helper cmdDomblkinfoPrint

From: Chen Hanxiao <chenhanxiao(a)gmail.com&gt; Introduce helper cmdDomblkinfoPrint for printing. Reviewed-by: John Ferlan <jferlan(a)redhat.com&gt; Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com&gt; --- tools/virsh-domain-monitor.c | 39 ++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8cbb3db37c..daa86e8310 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -400,6 +400,29 @@ static const vshCmdOptDef opts_domblkinfo[] = { {.name = NULL} }; +static void +cmdDomblkinfoPrint(vshControl *ctl, + const virDomainBlockInfo *info, + bool human) +{ + if (!human) { + vshPrint(ctl, "%-15s %llu\n", _("Capacity:"), info->capacity); + vshPrint(ctl, "%-15s %llu\n", _("Allocation:"), info->allocation); + vshPrint(ctl, "%-15s %llu\n", _("Physical:"), info->physical); + } else { + double val; + const char *unit; + + val = vshPrettyCapacity(info->capacity, &unit); + vshPrint(ctl, "%-15s %-.3lf %s\n", _("Capacity:"), val, unit); + val = vshPrettyCapacity(info->allocation, &unit); + vshPrint(ctl, "%-15s %-.3lf %s\n", _("Allocation:"), val, unit); + val = vshPrettyCapacity(info->physical, &unit); + vshPrint(ctl, "%-15s %-.3lf %s\n", _("Physical:"), val, unit); + } + +} + static bool cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) { @@ -420,21 +443,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) human = vshCommandOptBool(cmd, "human"); - if (!human) { - vshPrint(ctl, "%-15s %llu\n", _("Capacity:"), info.capacity); - vshPrint(ctl, "%-15s %llu\n", _("Allocation:"), info.allocation); - vshPrint(ctl, "%-15s %llu\n", _("Physical:"), info.physical); - } else { - double val; - const char *unit; - - val = vshPrettyCapacity(info.capacity, &unit); - vshPrint(ctl, "%-15s %-.3lf %s\n", _("Capacity:"), val, unit); - val = vshPrettyCapacity(info.allocation, &unit); - vshPrint(ctl, "%-15s %-.3lf %s\n", _("Allocation:"), val, unit); - val = vshPrettyCapacity(info.physical, &unit); - vshPrint(ctl, "%-15s %-.3lf %s\n", _("Physical:"), val, unit); - } + cmdDomblkinfoPrint(ctl, &info, human); ret = true; -- 2.17.1