Signed-off-by: Roland Schulz <schullzroll@gmail.com> --- tools/virsh-completer.c | 58 +++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 3 +++ tools/virsh-host.c | 3 +++ 3 files changed, 64 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 1df4d55af..b9ea42874 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -649,3 +649,61 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, VIR_FREE(ret); goto cleanup; } + +char ** +virshCellnoCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + xmlXPathContextPtr ctxt = NULL; + virshControlPtr priv = ctl->privData; + unsigned int ncells = 0; + xmlNodePtr *cells = NULL; + xmlDocPtr doc = NULL; + size_t i = 0; + char *cellid = NULL; + char *cap_xml = NULL; + char **ret = NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + goto error; + + if (!(cap_xml = virConnectGetCapabilities(priv->conn))) + goto error; + + if (!(doc = virXMLParseStringCtxt(cap_xml, _("capabilities"), &ctxt))) + goto error; + + ncells = virXPathNodeSet("/capabilities/host/topology/cells/cell", ctxt, &cells); + if (ncells <= 0) + goto error; + + if (VIR_ALLOC_N(ret, ncells + 1)) + goto error; + + for (i = 0; i < ncells; i++) { + VIR_FREE(cellid); + cellid = virXMLPropString(cells[i], "id"); + if (VIR_STRDUP(ret[i], cellid) < 0) + goto error; + } + + cleanup: + xmlXPathFreeContext(ctxt); + VIR_FREE(cells); + xmlFreeDoc(doc); + VIR_FREE(cap_xml); + VIR_FREE(cellid); + + return ret; + + error: + if (ret) { + for (i = 0; i < ncells; i++) + VIR_FREE(ret[i]); + } + VIR_FREE(ret); + goto cleanup; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 8e4d46394..ee0234ce0 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -78,4 +78,7 @@ char ** virshAllocpagesPagesizeCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshCellnoCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); #endif diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 293f06e9e..dfe58de30 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -149,6 +149,7 @@ static const vshCmdInfo info_freecell[] = { static const vshCmdOptDef opts_freecell[] = { {.name = "cellno", .type = VSH_OT_INT, + .completer = virshCellnoCompleter, .help = N_("NUMA cell number") }, {.name = "all", @@ -274,6 +275,7 @@ static const vshCmdInfo info_freepages[] = { static const vshCmdOptDef opts_freepages[] = { {.name = "cellno", .type = VSH_OT_INT, + .completer = virshCellnoCompleter, .help = N_("NUMA cell number") }, {.name = "pagesize", @@ -482,6 +484,7 @@ static const vshCmdOptDef opts_allocpages[] = { }, {.name = "cellno", .type = VSH_OT_INT, + .completer = virshCellnoCompleter, .help = N_("NUMA cell number") }, {.name = "add", -- 2.17.0