From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 25 Aug 2016 18:48:52 +0000 (-0400)
Subject: virsh: vcpuinfo: Report vcpu number from the structure rather than it's position
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=64f26276bfb2c4c01a3fc007e5449c9ca3d93de2;p=libvirt.git

virsh: vcpuinfo: Report vcpu number from the structure rather than it's position

virVcpuInfo contains the vcpu number that the data refers to. Report
what's returned by the daemon rather than the sequence number as with
sparse vcpu topologies they won't match.
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index de2a22c059..90d2543c9b 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6315,8 +6315,8 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
     }
 
     for (n = 0; n < ncpus; n++) {
-        vshPrint(ctl, "%-15s %d\n", _("VCPU:"), n);
         if (cpuinfo) {
+            vshPrint(ctl, "%-15s %d\n", _("VCPU:"), cpuinfo[n].number);
             vshPrint(ctl, "%-15s %d\n", _("CPU:"), cpuinfo[n].cpu);
             vshPrint(ctl, "%-15s %s\n", _("State:"),
                      virshDomainVcpuStateToString(cpuinfo[n].state));
@@ -6328,6 +6328,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd)
                 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"));