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>
This commit is contained in:
Michal Privoznik 2018-01-12 14:15:11 +01:00
parent 69026fc270
commit f81f8b62bd
3 changed files with 58 additions and 1 deletions

View File

@ -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;
}

View File

@ -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

View File

@ -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