* 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

diff --git a/ChangeLog b/ChangeLog
index 4d7743325c2919a8f1d179a9db27c0e7c0b34655..dd51667062108cc22883e43fe5d18323a984dc10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec  6 15:06:28 CET 2006 Daniel Veillard <veillard@redhat.com>
+
+       * 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 <veillard@redhat.com>
 
        * 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 f1b9b334e5786c0368cbd306264e4f7672639b72..2e79704b9bf7be07ae36c50ce83bfb99ee3f20e3 100644 (file)
--- 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);