External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-07 01:13:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Extract fallback handling in cmdVcpuinfo

Browse Source 
Put it into a separate function so that more fallback handling can be
added without making a mess.
This commit is contained in:
Peter Krempa 2016-09-29 16:37:35 +02:00
parent 63c56a0651
commit c946a30af2
1 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
tools/virsh-domain.c
View File

@ -6310,6 +6310,49 @@ virshVcpuinfoPrintAffinity(vshControl *ctl,
} }
static bool
virshVcpuinfoInactive(vshControl *ctl,
virDomainPtr dom,
int nvcpus,
int maxcpu,
bool pretty)
{
unsigned char *cpumaps = NULL;
size_t cpumaplen;
int ncpus;
size_t i;
bool ret = false;
cpumaplen = VIR_CPU_MAPLEN(maxcpu);
cpumaps = vshMalloc(ctl, nvcpus * cpumaplen);
if ((ncpus = virDomainGetVcpuPinInfo(dom, nvcpus,
cpumaps, cpumaplen,
VIR_DOMAIN_AFFECT_CONFIG)) < 0)
goto cleanup;
for (i = 0; i < ncpus; i++) {
if (i != 0)
vshPrint(ctl, "\n");
vshPrint(ctl, "%-15s %zu\n", _("VCPU:"), i);
vshPrint(ctl, "%-15s %s\n", _("CPU:"), _("N/A"));
vshPrint(ctl, "%-15s %s\n", _("State:"), _("N/A"));
vshPrint(ctl, "%-15s %s\n", _("CPU time"), _("N/A"));
if (virshVcpuinfoPrintAffinity(ctl, VIR_GET_CPUMAP(cpumaps, cpumaplen, i),
maxcpu, pretty) < 0)
goto cleanup;
}
ret = true;
cleanup:
VIR_FREE(cpumaps);
return ret;
}
static bool static bool
cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
{ {
@ -6343,32 +6386,22 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
if (info.state != VIR_DOMAIN_SHUTOFF) if (info.state != VIR_DOMAIN_SHUTOFF)
goto cleanup; goto cleanup;
/* fall back to virDomainGetVcpuPinInfo and free cpuinfo to mark this */ /* for offline VMs we can return pinning information */
VIR_FREE(cpuinfo); ret = virshVcpuinfoInactive(ctl, dom, info.nrVirtCpu, maxcpu, pretty);
if ((ncpus = virDomainGetVcpuPinInfo(dom, info.nrVirtCpu, goto cleanup;
cpumaps, cpumaplen,
VIR_DOMAIN_AFFECT_CONFIG)) < 0)
goto cleanup;
} }
for (n = 0; n < ncpus; n++) { for (n = 0; n < ncpus; n++) {
if (cpuinfo) { vshPrint(ctl, "%-15s %d\n", _("VCPU:"), cpuinfo[n].number);
vshPrint(ctl, "%-15s %d\n", _("VCPU:"), cpuinfo[n].number); vshPrint(ctl, "%-15s %d\n", _("CPU:"), cpuinfo[n].cpu);
vshPrint(ctl, "%-15s %d\n", _("CPU:"), cpuinfo[n].cpu); vshPrint(ctl, "%-15s %s\n", _("State:"),
vshPrint(ctl, "%-15s %s\n", _("State:"), virshDomainVcpuStateToString(cpuinfo[n].state));
virshDomainVcpuStateToString(cpuinfo[n].state)); if (cpuinfo[n].cpuTime != 0) {
if (cpuinfo[n].cpuTime != 0) { double cpuUsed = cpuinfo[n].cpuTime;
double cpuUsed = cpuinfo[n].cpuTime;
cpuUsed /= 1000000000.0; cpuUsed /= 1000000000.0;
vshPrint(ctl, "%-15s %.1lfs\n", _("CPU time:"), cpuUsed); vshPrint(ctl, "%-15s %.1lfs\n", _("CPU time:"), cpuUsed);
}
} else {
vshPrint(ctl, "%-15s %d\n", _("VCPU:"), n);
vshPrint(ctl, "%-15s %s\n", _("CPU:"), _("N/A"));
vshPrint(ctl, "%-15s %s\n", _("State:"), _("N/A"));
vshPrint(ctl, "%-15s %s\n", _("CPU time"), _("N/A"));
} }
if (virshVcpuinfoPrintAffinity(ctl, VIR_GET_CPUMAP(cpumaps, cpumaplen, n), if (virshVcpuinfoPrintAffinity(ctl, VIR_GET_CPUMAP(cpumaps, cpumaplen, n),