[libvirt] [PATCH 1/2 v2] conf: List only online cpus for virsh vcpupin

[Nitesh Konkar]

Currently when the vcpu placement is static
and cpuset is not specified, CPU Affinity
under virsh vcpupin shows 0..CPUMAX. This
patchset will result in display of only online
CPU's under CPU Affinity on linux.

Signed-off-by: Nitesh Konkar <nitkon12 at linux.vnet.ibm.com>
---
 src/conf/domain_conf.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a233c0c..78efbc6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -55,6 +55,7 @@
 #include "virtpm.h"
 #include "virstring.h"
 #include "virnetdev.h"
+#include "virhostcpu.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 
@@ -1543,6 +1544,7 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
 {
     int maxvcpus = virDomainDefGetVcpusMax(def);
     virBitmapPtr allcpumap = NULL;
+    virBitmapPtr bitmap = NULL;
     size_t i;
 
     if (hostcpus < 0)
@@ -1555,13 +1557,16 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
 
     for (i = 0; i < maxvcpus && i < ncpumaps; i++) {
         virDomainVcpuDefPtr vcpu = virDomainDefGetVcpu(def, i);
-        virBitmapPtr bitmap = NULL;
+        bitmap = NULL;
 
         if (vcpu && vcpu->cpumask)
             bitmap = vcpu->cpumask;
         else if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO &&
                  autoCpuset)
             bitmap = autoCpuset;
+        else if (def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC &&
+                 virHostCPUGetOnlineBitmap())
+            bitmap = virHostCPUGetOnlineBitmap();
         else if (def->cpumask)
             bitmap = def->cpumask;
         else
@@ -1571,6 +1576,7 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
     }
 
     virBitmapFree(allcpumap);
+    virBitmapFree(bitmap);
     return i;
 }
 
-- 
2.1.0