From f81f8b62bd17d4b5e91a5cc770e2b93338b0d150 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 12 Jan 2018 14:15:11 +0100
Subject: [PATCH] virsh: Introduce virshStorageVolNameCompleter

This one is a bit simpler since virStoragePoolListAllVolumes()
has no flags yet.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 tools/virsh-completer.c | 52 +++++++++++++++++++++++++++++++++++++++++
 tools/virsh-completer.h |  4 ++++
 tools/virsh-volume.c    |  3 ++-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index 947c326fcc..4e1bd9fbb1 100644
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -24,6 +24,7 @@
 
 #include "virsh-completer.h"
 #include "virsh.h"
+#include "virsh-pool.h"
 #include "virsh-util.h"
 #include "internal.h"
 #include "viralloc.h"
@@ -195,3 +196,54 @@ virshStoragePoolNameCompleter(vshControl *ctl,
     VIR_FREE(ret);
     return NULL;
 }
+
+
+char **
+virshStorageVolNameCompleter(vshControl *ctl,
+                             const vshCmd *cmd,
+                             unsigned int flags)
+{
+    virshControlPtr priv = ctl->privData;
+    virStoragePoolPtr pool = NULL;
+    virStorageVolPtr *vols = NULL;
+    int nvols = 0;
+    size_t i = 0;
+    char **ret = NULL;
+
+    virCheckFlags(0, NULL);
+
+    if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+        return NULL;
+
+    if (!(pool = virshCommandOptPool(ctl, cmd, "pool", NULL)))
+        return false;
+
+    if ((nvols = virStoragePoolListAllVolumes(pool, &vols, flags)) < 0)
+        goto error;
+
+    if (VIR_ALLOC_N(ret, nvols + 1) < 0)
+        goto error;
+
+    for (i = 0; i < nvols; i++) {
+        const char *name = virStorageVolGetName(vols[i]);
+
+        if (VIR_STRDUP(ret[i], name) < 0)
+            goto error;
+
+        virStorageVolFree(vols[i]);
+    }
+    VIR_FREE(vols);
+    virStoragePoolFree(pool);
+
+    return ret;
+
+ error:
+    for (; i < nvols; i++)
+        virStorageVolFree(vols[i]);
+    VIR_FREE(vols);
+    for (i = 0; i < nvols; i++)
+        VIR_FREE(ret[i]);
+    VIR_FREE(ret);
+    virStoragePoolFree(pool);
+    return NULL;
+}
diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index 249e793b9f..1e4ce59324 100644
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -42,4 +42,8 @@ char ** virshStoragePoolNameCompleter(vshControl *ctl,
                                       const vshCmd *cmd,
                                       unsigned int flags);
 
+char ** virshStorageVolNameCompleter(vshControl *ctl,
+                                     const vshCmd *cmd,
+                                     unsigned int flags);
+
 #endif
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index bfbb7c7d7a..bacbec0d27 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -63,7 +63,8 @@
     {.name = "vol", \
      .type = VSH_OT_DATA, \
      .flags = VSH_OFLAG_REQ, \
-     .help = N_("vol name, key or path") \
+     .help = N_("vol name, key or path"), \
+     .completer = virshStorageVolNameCompleter, \
     }
 
 virStorageVolPtr