NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Add logical CPU list completion for --cpulist argument

Browse Source 
Currently this patch works for the commands emulatorpin, iothreadpin and
vcpupin.

Signed-off-by: Lin Ma <lma@suse.de>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Lin Ma 2020-09-11 15:13:14 +08:00 committed by Michal Privoznik
parent b3198b95d6
commit a9aac97fdb
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/virsh-completer-domain.c
View File

@ -564,3 +564,34 @@ virshDomainVcpulistCompleter(vshControl *ctl,
virshDomainFree(dom); virshDomainFree(dom);
return ret; return ret;
} }
char **
virshDomainCpulistCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags)
{
virshControlPtr priv = ctl->privData;
size_t i;
int cpunum;
g_autofree unsigned char *cpumap = NULL;
unsigned int online;
VIR_AUTOSTRINGLIST cpulist = NULL;
const char *cpuid = NULL;
virCheckFlags(0, NULL);
if (vshCommandOptStringQuiet(ctl, cmd, "cpulist", &cpuid) < 0)
return NULL;
if ((cpunum = virNodeGetCPUMap(priv->conn, &cpumap, &online, 0)) < 0)
return NULL;
if (VIR_ALLOC_N(cpulist, cpunum + 1) < 0)
return NULL;
for (i = 0; i < cpunum; i++)
cpulist[i] = g_strdup_printf("%zu", i);
return virshCommaStringListComplete(cpuid, (const char **)cpulist);
}

4
tools/virsh-completer-domain.h
View File

@ -86,3 +86,7 @@ char ** virshDomainVcpuCompleter(vshControl *ctl,
char ** virshDomainVcpulistCompleter(vshControl *ctl, char ** virshDomainVcpulistCompleter(vshControl *ctl,
const vshCmd *cmd, const vshCmd *cmd,
unsigned int flags); unsigned int flags);
char ** virshDomainCpulistCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);

3
tools/virsh-domain.c
View File

@ -7008,6 +7008,7 @@ static const vshCmdOptDef opts_vcpupin[] = {
{.name = "cpulist", {.name = "cpulist",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.flags = VSH_OFLAG_EMPTY_OK, .flags = VSH_OFLAG_EMPTY_OK,
.completer = virshDomainCpulistCompleter,
.help = N_("host cpu number(s) to set, or omit option to query") .help = N_("host cpu number(s) to set, or omit option to query")
}, },
VIRSH_COMMON_OPT_DOMAIN_CONFIG, VIRSH_COMMON_OPT_DOMAIN_CONFIG,
@ -7235,6 +7236,7 @@ static const vshCmdOptDef opts_emulatorpin[] = {
{.name = "cpulist", {.name = "cpulist",
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.flags = VSH_OFLAG_EMPTY_OK, .flags = VSH_OFLAG_EMPTY_OK,
.completer = virshDomainCpulistCompleter,
.help = N_("host cpu number(s) to set, or omit option to query") .help = N_("host cpu number(s) to set, or omit option to query")
}, },
VIRSH_COMMON_OPT_DOMAIN_CONFIG, VIRSH_COMMON_OPT_DOMAIN_CONFIG,
@ -7757,6 +7759,7 @@ static const vshCmdOptDef opts_iothreadpin[] = {
{.name = "cpulist", {.name = "cpulist",
.type = VSH_OT_DATA, .type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
.completer = virshDomainCpulistCompleter,
.help = N_("host cpu number(s) to set") .help = N_("host cpu number(s) to set")
}, },
VIRSH_COMMON_OPT_DOMAIN_CONFIG, VIRSH_COMMON_OPT_DOMAIN_CONFIG,