From 321c24bb00cd126f9a01941e99a5f71a9074ba1b Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 12 Oct 2006 12:31:51 +0000 Subject: [PATCH] * src/xen_internal.c: applied patch from Philippe Berthault fixing the vcpu number initialization Daniel --- ChangeLog | 5 +++++ src/xen_internal.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3098e7749b..462a896d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 12 13:37:24 CEST 2006 Daniel Veillard + + * src/xen_internal.c: applied patch from Philippe Berthault + fixing the vcpu number initialization + Wed Oct 11 17:16:44 CEST 2006 Daniel Veillard * src/xen_internal.c: applied patch from Peter Vetere so that diff --git a/src/xen_internal.c b/src/xen_internal.c index c4798d396e..8d08275360 100644 --- 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;