From: Simon Kobyda <skobyda@redhat.com>
Date: Fri, 21 Sep 2018 14:17:18 +0000 (+0200)
Subject: virsh: Implement vshTable API to domblkinfo
X-Git-Tag: v4.8.0-rc1~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2979bbfb0f5bba98dbc1e30ab31e0003f96d9cb4;p=thirdparty%2Flibvirt.git

virsh: Implement vshTable API to domblkinfo

Signed-off-by: Simon Kobyda <skobyda@redhat.com>
---

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 00ff6a6491..b6fe31cc72 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);