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

virshDomainGetVcpuBitmap: Refactor cleanup

Browse Source 
Rename the temp variable that is being returned and use automatic
pointer clearing for it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Peter Krempa 2021-09-15 15:13:24 +02:00
parent 59e74c3193
commit eb2e317c65
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/virsh-domain.c
View File

@ -6677,7 +6677,7 @@ virshDomainGetVcpuBitmap(vshControl *ctl,
bool inactive) bool inactive)
{ {
unsigned int flags = 0; unsigned int flags = 0;
virBitmap *ret = NULL; g_autoptr(virBitmap) cpumap = NULL;
g_autoptr(xmlDoc) xml = NULL; g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL; g_autoptr(xmlXPathContext) ctxt = NULL;
g_autofree xmlNodePtr *nodes = NULL; g_autofree xmlNodePtr *nodes = NULL;
@ -6703,14 +6703,14 @@ virshDomainGetVcpuBitmap(vshControl *ctl,
if (curvcpus == 0) if (curvcpus == 0)
curvcpus = maxvcpus; curvcpus = maxvcpus;
ret = virBitmapNew(maxvcpus); cpumap = virBitmapNew(maxvcpus);
if ((nnodes = virXPathNodeSet("/domain/vcpus/vcpu", ctxt, &nodes)) <= 0) { if ((nnodes = virXPathNodeSet("/domain/vcpus/vcpu", ctxt, &nodes)) <= 0) {
/* if the specific vcpu state is missing provide a fallback */ /* if the specific vcpu state is missing provide a fallback */
for (i = 0; i < curvcpus; i++) for (i = 0; i < curvcpus; i++)
ignore_value(virBitmapSetBit(ret, i)); ignore_value(virBitmapSetBit(cpumap, i));
return ret; return g_steal_pointer(&cpumap);
} }
for (i = 0; i < nnodes; i++) { for (i = 0; i < nnodes; i++) {
@ -6723,16 +6723,15 @@ virshDomainGetVcpuBitmap(vshControl *ctl,
continue; continue;
if (STREQ(online, "yes")) if (STREQ(online, "yes"))
ignore_value(virBitmapSetBit(ret, vcpuid)); ignore_value(virBitmapSetBit(cpumap, vcpuid));
} }
if (virBitmapCountBits(ret) != curvcpus) { if (virBitmapCountBits(cpumap) != curvcpus) {
vshError(ctl, "%s", _("Failed to retrieve vcpu state bitmap")); vshError(ctl, "%s", _("Failed to retrieve vcpu state bitmap"));
virBitmapFree(ret);
return NULL; return NULL;
} }
return ret; return g_steal_pointer(&cpumap);
} }