[libvirt] [PATCH 01/19] virsh: Add current vcpu list completion to guestvcpus command
Unlike the setvcpu command, The option --cpulist of guestvcpus command
means the current vcpus list, rather than the maxvcpus list.
Signed-off-by: Lin Ma <lma(a)suse.com>
---
tools/virsh-completer-domain.c | 36 ++++++++++++++++++++++++++++++++++
tools/virsh-completer-domain.h | 4 ++++
tools/virsh-domain.c | 1 +
3 files changed, 41 insertions(+)
diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
index c657627ac1..6f67c91746 100644
--- a/tools/virsh-completer-domain.c
+++ b/tools/virsh-completer-domain.c
@@ -581,3 +581,39 @@ virshDomainCpulistCompleter(vshControl *ctl,
return virshCommaStringListComplete(cpuid, (const char **)cpulist);
}
+
+char **
+virshDomainVcpulistViaAgentCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags)
+{
+ virDomainPtr dom = NULL;
+ int nvcpus;
+ unsigned int id;
+ VIR_AUTOSTRINGLIST cpulist = NULL;
+ const char *vcpuid = NULL;
+ char **ret = NULL;
+
+ virCheckFlags(0, NULL);
+
+ if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
+ return NULL;
+
+ if (vshCommandOptStringQuiet(ctl, cmd, "cpulist", &vcpuid) < 0)
+ goto cleanup;
+
+ /* retrieve vcpu count from the guest instead of the hypervisor */
+ if ((nvcpus = virDomainGetVcpusFlags(dom, VIR_DOMAIN_VCPU_GUEST)) < 0)
+ goto cleanup;
+
+ cpulist = g_new0(char *, nvcpus + 1);
+
+ for (id = 0; id < nvcpus; id++)
+ cpulist[id] = g_strdup_printf("%u", id);
+
+ ret = virshCommaStringListComplete(vcpuid, (const char **)cpulist);
+
+ cleanup:
+ virshDomainFree(dom);
+ return ret;
+}
diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h
index d38efd5ea8..d5021f6aa6 100644
--- a/tools/virsh-completer-domain.h
+++ b/tools/virsh-completer-domain.h
@@ -90,3 +90,7 @@ char ** virshDomainVcpulistCompleter(vshControl *ctl,
char ** virshDomainCpulistCompleter(vshControl *ctl,
const vshCmd *cmd,
unsigned int flags);
+
+char ** virshDomainVcpulistViaAgentCompleter(vshControl *ctl,
+ const vshCmd *cmd,
+ unsigned int flags);
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index ef347585e8..c051b047ea 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -7436,6 +7436,7 @@ static const vshCmdOptDef opts_guestvcpus[] = {
VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
{.name = "cpulist",
.type = VSH_OT_STRING,
+ .completer = virshDomainVcpulistViaAgentCompleter,
.help = N_("list of cpus to enable or disable")
},
{.name = "enable",
--
2.26.0