[libvirt] [PATCH v4] virsh: lookup interface by name or mac other than one by one

Use virMacAddrParse() to distinguish interface name from interface mac address. --- tools/virsh-interface.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index f75c572..1c2e40b 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -35,6 +35,7 @@ #include "virbuffer.h" #include "viralloc.h" #include "virfile.h" +#include "virmacaddr.h" #include "virutil.h" #include "virxml.h" #include "virstring.h" @@ -46,6 +47,8 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, { virInterfacePtr iface = NULL; const char *n = NULL; + bool is_mac = false; + virMacAddr dummy; virCheckFlags(VSH_BYNAME | VSH_BYMAC, NULL); if (!optname) @@ -62,14 +65,17 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, if (name) *name = n; + if (virMacAddrParse(n, &dummy) == 0) + is_mac = true; + /* try it by NAME */ - if (flags & VSH_BYNAME) { + if (!is_mac && (flags & VSH_BYNAME)) { vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface NAME\n", cmd->def->name, optname); iface = virInterfaceLookupByName(ctl->conn, n); - } + /* try it by MAC */ - if (!iface && (flags & VSH_BYMAC)) { + } else if (is_mac && (flags & VSH_BYMAC)) { vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface MAC\n", cmd->def->name, optname); iface = virInterfaceLookupByMACString(ctl->conn, n); -- 1.8.1.4