External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh-interface: Add a static helper virshInterfaceStringHelper

Browse Source 
It will be helpful to get the desired string of interface name/mac in a
consistent way.

Signed-off-by: Lin Ma <lma@suse.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Lin Ma 2020-11-10 17:50:55 +08:00 committed by Michal Privoznik
parent f8b3e98a01
commit 9b751469ea
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/virsh-completer-interface.c
View File

@ -25,16 +25,19 @@
#include "virsh.h"
#include "virstring.h"
char **
virshInterfaceNameCompleter(vshControl *ctl,
const vshCmd *cmd G_GNUC_UNUSED,
unsigned int flags)
typedef const char *
(*virInterfaceStringCallback)(virInterfacePtr iface);
static char **
virshInterfaceStringHelper(vshControl *ctl,
const vshCmd *cmd G_GNUC_UNUSED,
unsigned int flags,
virInterfaceStringCallback cb)
{
virshControlPtr priv = ctl->privData;
virInterfacePtr *ifaces = NULL;
int nifaces = 0;
size_t i = 0;
char **ret = NULL;
VIR_AUTOSTRINGLIST tmp = NULL;
virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE |
@ -50,15 +53,23 @@ virshInterfaceNameCompleter(vshControl *ctl,
tmp = g_new0(char *, nifaces + 1);
for (i = 0; i < nifaces; i++) {
const char *name = virInterfaceGetName(ifaces[i]);
const char *name = (cb)(ifaces[i]);
tmp[i] = g_strdup(name);
}
ret = g_steal_pointer(&tmp);
for (i = 0; i < nifaces; i++)
virInterfaceFree(ifaces[i]);
g_free(ifaces);
return ret;
return g_steal_pointer(&tmp);
}
char **
virshInterfaceNameCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags)
{
return virshInterfaceStringHelper(ctl, cmd, flags, virInterfaceGetName);
}