From 01d1b535f8fe66bad148148ef25d4444bf6d494b Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 26 Jun 2018 12:41:34 +0200 Subject: [PATCH] virsh: Provide completer for detach-device-alias Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- tools/virsh-completer.c | 48 +++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-domain.c | 1 + 3 files changed, 53 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 0dc6ae82e1..2327e08340 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -856,3 +856,51 @@ virshCellnoCompleter(vshControl *ctl, VIR_FREE(ret); goto cleanup; } + + +char ** +virshDomainDeviceAliasCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + xmlDocPtr xmldoc = NULL; + xmlXPathContextPtr ctxt = NULL; + int naliases; + xmlNodePtr *aliases = NULL; + size_t i; + unsigned int domainXMLFlags = 0; + char **ret = NULL; + char **tmp = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (vshCommandOptBool(cmd, "config")) + domainXMLFlags = VIR_DOMAIN_XML_INACTIVE; + + if (virshDomainGetXML(ctl, cmd, domainXMLFlags, &xmldoc, &ctxt) < 0) + goto cleanup; + + naliases = virXPathNodeSet("./devices//alias/@name", ctxt, &aliases); + if (naliases < 0) + goto cleanup; + + if (VIR_ALLOC_N(tmp, naliases + 1) < 0) + goto cleanup; + + for (i = 0; i < naliases; i++) { + if (!(tmp[i] = virXMLNodeContentString(aliases[i]))) + goto cleanup; + } + + VIR_STEAL_PTR(ret, tmp); + cleanup: + VIR_FREE(aliases); + xmlFreeDoc(xmldoc); + xmlXPathFreeContext(ctxt); + virStringListFree(tmp); + return ret; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index fcff040135..1c14bb2a54 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -98,6 +98,10 @@ char ** virshNodedevEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshDomainDeviceAliasCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + char ** virshCellnoCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6aa79f11b9..e9b88f0013 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11684,6 +11684,7 @@ static const vshCmdOptDef opts_detach_device_alias[] = { {.name = "alias", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, + .completer = virshDomainDeviceAliasCompleter, .help = N_("device alias") }, VIRSH_COMMON_OPT_DOMAIN_CONFIG, -- GitLab