* src/xen_internal.c: applied patch from Philippe Berthault

  fixing the vcpu number initialization
Daniel

diff --git a/ChangeLog b/ChangeLog
index 3098e7749bce45b967d05c4adba5aecdfa66c46c..462a896d3d45cb7b82d3f67cd055dcd6bca4d424 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 12 13:37:24 CEST 2006 Daniel Veillard <veillard@redhat.com>
+
+       * src/xen_internal.c: applied patch from Philippe Berthault
+         fixing the vcpu number initialization
+
 Wed Oct 11 17:16:44 CEST 2006 Daniel Veillard <veillard@redhat.com>
 
        * src/xen_internal.c: applied patch from Peter Vetere so that

diff --git a/src/xen_internal.c b/src/xen_internal.c
index c4798d396ecc2214314c5d19992bd813bf1ccaee..8d08275360b6d084e36068da5b4dc3f37f5ea941 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -1036,7 +1036,7 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt,
         ret = xenHypervisorDoV2Dom(handle, &op);
         if (ret < 0)
             return(-1);
-        ipt->number = id;
+        ipt->number = vcpu;
         if (op.u.getvcpuinfo.online) {
             if (op.u.getvcpuinfo.running) ipt->state = VIR_VCPU_RUNNING;
             if (op.u.getvcpuinfo.blocked) ipt->state = VIR_VCPU_BLOCKED;
@@ -1078,7 +1078,7 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt,
             ret = xenHypervisorDoV1Op(handle, &op);
             if (ret < 0)
                 return(-1);
-            ipt->number = id;
+            ipt->number = vcpu;
             if (op.u.getvcpuinfo.online) {
                 if (op.u.getvcpuinfo.running) ipt->state = VIR_VCPU_RUNNING;
                 if (op.u.getvcpuinfo.blocked) ipt->state = VIR_VCPU_BLOCKED;
@@ -1102,7 +1102,7 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt,
             ret = xenHypervisorDoV0Op(handle, &op);
             if (ret < 0)
                 return(-1);
-            ipt->number = id;
+            ipt->number = vcpu;
             if (op.u.getvcpuinfo.online) {
                 if (op.u.getvcpuinfo.running) ipt->state = VIR_VCPU_RUNNING;
                 if (op.u.getvcpuinfo.blocked) ipt->state = VIR_VCPU_BLOCKED;