[PATCH 1/2] virshDomainGetVcpuBitmap: Return bitmap when taking the fallback path

Peter Krempa pkrempa at redhat.com
Wed Sep 15 13:21:11 UTC 2021


In case the specific VCPU states are not present in the XML we were
taking a fallback code path just noting that all cpus of the VM are
enabled.

This was broken by a mistake in a recent refactor where a 'goto cleanup'
was mistakenly replaced by a 'return NULL'. This broke reporting of cpus
and also caused a memory leak.

Return the fallback cpu map.

Fixes: bd1f40fe7d4
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2004429
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tools/virsh-domain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index e5bd1fdd75..f5a3e1accc 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6710,7 +6710,7 @@ virshDomainGetVcpuBitmap(vshControl *ctl,
         for (i = 0; i < curvcpus; i++)
             ignore_value(virBitmapSetBit(ret, i));

-        return NULL;
+        return ret;
     }

     for (i = 0; i < nnodes; i++) {
-- 
2.31.1




More information about the libvir-list mailing list