[libvirt] [PATCH 2/2] virsh: Add dir type for listing volumes with vol-list

Fix of output of detailed volume list. BZ #727088 --- tools/virsh.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1d660d0..5d88d84 100644 --- 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) - volInfoTexts[i].type = vshStrdup(ctl, _("file")); - else - volInfoTexts[i].type = vshStrdup(ctl, _("block")); + switch (volumeInfo.type) { + case VIR_STORAGE_VOL_FILE: + volInfoTexts[i].type = vshStrdup(ctl, _("file")); + 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); -- 1.7.6