virsh: Add dir type for listing volumes with vol-list

Fix of output of detailed volume list. BZ #727088

virsh: Add dir type for listing volumes with vol-list
Fix of output of detailed volume list. BZ #727088
594f564c · Peter Krempa · Eric Blake · 6c55124f · 594f564c
隐藏空白更改
内联并排

Showing with 13 addition and 4 deletion

tools/virsh.c tools/virsh.c +13 -4

未找到文件。
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -8989,10 +8989,19 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
                /* Convert the returned volume info into output strings */
                /* Volume type */
-                if (volumeInfo.type == VIR_STORAGE_VOL_FILE)
+                switch (volumeInfo.type) {
-                    volInfoTexts[i].type = vshStrdup(ctl, _("file"));
+                        case VIR_STORAGE_VOL_FILE:
-                else
+                            volInfoTexts[i].type = vshStrdup(ctl, _("file"));
-                    volInfoTexts[i].type = vshStrdup(ctl, _("block"));
+                            break;
+                        case VIR_STORAGE_VOL_BLOCK:
+                            volInfoTexts[i].type = vshStrdup(ctl, _("block"));
+                            break;
+                        case VIR_STORAGE_VOL_DIR:
+                            volInfoTexts[i].type = vshStrdup(ctl, _("dir"));
+                            break;
+                        default:
+                            volInfoTexts[i].type = vshStrdup(ctl, _("unknown"));
+                }
                /* Create the capacity output string */
                val = prettyCapacity(volumeInfo.capacity, &unit);