[libvirt] [PATCH v2 07/13] virsh: Implement vshTable API to domblkinfo
Signed-off-by: Simon Kobyda <skobyda(a)redhat.com>
---
tools/virsh-domain-monitor.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index cb48f9a7be..80c7e8a99e 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -460,6 +460,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd)
char *cap = NULL;
char *alloc = NULL;
char *phy = NULL;
+ vshTablePtr table = NULL;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false;
@@ -483,11 +484,10 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd)
if (ndisks < 0)
goto cleanup;
- /* print the title */
- vshPrintExtra(ctl, "%-10s %-15s %-15s %-15s\n", _("Target"),
- _("Capacity"), _("Allocation"),
_("Physical"));
- vshPrintExtra(ctl, "-----------------------------"
- "------------------------\n");
+ /* title */
+ table = vshTableNew(_("Target"), _("Capacity"),
_("Allocation"), _("Physical"), NULL);
+ if (!table)
+ goto cleanup;
for (i = 0; i < ndisks; i++) {
ctxt->node = disks[i];
@@ -512,11 +512,15 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd)
if (!cmdDomblkinfoGet(ctl, &info, &cap, &alloc, &phy,
human))
goto cleanup;
- vshPrint(ctl, "%-10s %-15s %-15s %-15s\n", target, cap, alloc,
phy);
+ if (vshTableRowAppend(table, target, cap, alloc, phy, NULL) < 0)
+ goto cleanup;
VIR_FREE(target);
VIR_FREE(protocol);
}
+
+ vshTablePrintToStdout(table, ctl);
+
} else {
if (virDomainGetBlockInfo(dom, device, &info, 0) < 0)
goto cleanup;
@@ -531,6 +535,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd)
ret = true;
cleanup:
+ vshTableFree(table);
VIR_FREE(cap);
VIR_FREE(alloc);
VIR_FREE(phy);
--
2.17.1