shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

virsh-domain.c: modernize virshVcpuinfoInactive()

Browse Source 
Use g_auto* in the string and in the bitmap. Remove the
cleanup label since it's now unneeded.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-06-26 19:10:40 -03:00 committed by Michal Privoznik
parent de6a40f01f
commit a3a628f54c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/virsh-domain.c
View File

@ -6886,16 +6886,15 @@ virshVcpuinfoInactive(vshControl *ctl,
int maxcpu, int maxcpu,
bool pretty) bool pretty)
{ {
unsigned char *cpumaps = NULL; g_autofree unsigned char *cpumaps = NULL;
size_t cpumaplen; size_t cpumaplen;
int ncpus; int ncpus;
virBitmapPtr vcpus = NULL; g_autoptr(virBitmap) vcpus = NULL;
ssize_t nextvcpu = -1; ssize_t nextvcpu = -1;
bool ret = false;
bool first = true; bool first = true;
if (!(vcpus = virshDomainGetVcpuBitmap(ctl, dom, true))) if (!(vcpus = virshDomainGetVcpuBitmap(ctl, dom, true)))
goto cleanup; return false;
cpumaplen = VIR_CPU_MAPLEN(maxcpu); cpumaplen = VIR_CPU_MAPLEN(maxcpu);
cpumaps = vshMalloc(ctl, virBitmapSize(vcpus) * cpumaplen); cpumaps = vshMalloc(ctl, virBitmapSize(vcpus) * cpumaplen);
@ -6903,7 +6902,7 @@ virshVcpuinfoInactive(vshControl *ctl,
if ((ncpus = virDomainGetVcpuPinInfo(dom, virBitmapSize(vcpus), if ((ncpus = virDomainGetVcpuPinInfo(dom, virBitmapSize(vcpus),
cpumaps, cpumaplen, cpumaps, cpumaplen,
VIR_DOMAIN_AFFECT_CONFIG)) < 0) VIR_DOMAIN_AFFECT_CONFIG)) < 0)
goto cleanup; return false;
while ((nextvcpu = virBitmapNextSetBit(vcpus, nextvcpu)) >= 0) { while ((nextvcpu = virBitmapNextSetBit(vcpus, nextvcpu)) >= 0) {
if (!first) if (!first)
@ -6918,15 +6917,10 @@ virshVcpuinfoInactive(vshControl *ctl,
if (virshVcpuinfoPrintAffinity(ctl, if (virshVcpuinfoPrintAffinity(ctl,
VIR_GET_CPUMAP(cpumaps, cpumaplen, nextvcpu), VIR_GET_CPUMAP(cpumaps, cpumaplen, nextvcpu),
maxcpu, pretty) < 0) maxcpu, pretty) < 0)
goto cleanup; return false;
} }
ret = true; return true;
cleanup:
virBitmapFree(vcpus);
VIR_FREE(cpumaps);
return ret;
} }