From fa76c4fb2c4939e871e13e7c09b718cc6bf775f3 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 6 Dec 2006 15:02:03 +0000 Subject: [PATCH] * src/xen_internal.c: the structure passed to the vcpuinfo hypercall had changed between version 1 and version 2 too, the leading domain field disapeared since it goes in the including op. Fixes redhat bugs #217370 and #217743 Daniel --- ChangeLog | 7 +++++++ src/xen_internal.c | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d7743325c..dd51667062 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Dec 6 15:06:28 CET 2006 Daniel Veillard + + * src/xen_internal.c: the structure passed to the vcpuinfo hypercall + had changed between version 1 and version 2 too, the leading domain + field disapeared since it goes in the including op. Fixes redhat + bugs #217370 and #217743 + Mon Dec 4 17:47:03 CET 2006 Daniel Veillard * po/ca.po po/fr.po po/hi.po: merging more localizations coming diff --git a/src/xen_internal.c b/src/xen_internal.c index f1b9b334e5..2e79704b9b 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -338,7 +338,6 @@ typedef struct xen_v0_vcpuinfo xen_v0_vcpuinfo; typedef struct xen_v0_vcpuinfo xen_v1_vcpuinfo; struct xen_v2_vcpuinfo { - domid_t domain; /* owner's domain */ uint32_t vcpu; /* the vcpu number */ uint8_t online; /* seen as on line */ uint8_t blocked; /* blocked on event */ @@ -1036,7 +1035,7 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, memset(&op, 0, sizeof(op)); op.cmd = XEN_V2_OP_GETVCPUINFO; op.domain = (domid_t) id; - op.u.setvcpumap.vcpu = vcpu; + op.u.getvcpuinfo.vcpu = (uint16_t) vcpu; ret = xenHypervisorDoV2Dom(handle, &op); if (ret < 0) return(-1);