[Xen-changelog] Fix the Xen build.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1439, 2005/05/12 16:25:01+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix the Xen build.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 dom0_ops.c |   10 +++++-----
 domain.c   |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)


diff -Nru a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
--- a/xen/common/dom0_ops.c     2005-05-12 12:04:58 -04:00
+++ b/xen/common/dom0_ops.c     2005-05-12 12:04:58 -04:00
@@ -230,15 +230,15 @@
             break;
         }
         
-        if ( (op->u.pincpudomain.exec_domain >= MAX_VIRT_CPUS) ||
-             !d->exec_domain[op->u.pincpudomain.exec_domain] )
+        if ( (op->u.pincpudomain.vcpu >= MAX_VIRT_CPUS) ||
+             !d->exec_domain[op->u.pincpudomain.vcpu] )
         {
             ret = -EINVAL;
             put_domain(d);
             break;
         }
 
-        ed = d->exec_domain[op->u.pincpudomain.exec_domain];
+        ed = d->exec_domain[op->u.pincpudomain.vcpu];
         if ( ed == NULL )
         {
             ret = -ESRCH;
@@ -382,14 +382,14 @@
             break;
         }
 
-        if ( op->u.getvcpucontext.exec_domain >= MAX_VIRT_CPUS )
+        if ( op->u.getvcpucontext.vcpu >= MAX_VIRT_CPUS )
         {
             ret = -EINVAL;
             put_domain(d);
             break;
         }
         
-        ed = d->exec_domain[op->u.getvcpucontext.exec_domain];
+        ed = d->exec_domain[op->u.getvcpucontext.vcpu];
         if ( ed == NULL )
         {
             ret = -ESRCH;
diff -Nru a/xen/common/domain.c b/xen/common/domain.c
--- a/xen/common/domain.c       2005-05-12 12:04:58 -04:00
+++ b/xen/common/domain.c       2005-05-12 12:04:58 -04:00
@@ -221,7 +221,7 @@
 {
     int rc = 0;
     struct vcpu_guest_context *c = NULL;
-    unsigned long vcpu = setdomaininfo->exec_domain;
+    unsigned long vcpu = setdomaininfo->vcpu;
     struct exec_domain *ed; 
 
     if ( (vcpu >= MAX_VIRT_CPUS) || ((ed = d->exec_domain[vcpu]) == NULL) )

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog