ia64/xen-unstable

changeset 4883:13190ce86cae

bitkeeper revision 1.1389.1.50 (4283754dTJV8OKiH7gTm6FnKuQ2bVQ)

Fix the Xen build.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu May 12 15:25:01 2005 +0000 (2005-05-12)
parents 7bc5d4e9b217
children ace579e991fe
files xen/common/dom0_ops.c xen/common/domain.c
line diff
     1.1 --- a/xen/common/dom0_ops.c	Thu May 12 15:02:52 2005 +0000
     1.2 +++ b/xen/common/dom0_ops.c	Thu May 12 15:25:01 2005 +0000
     1.3 @@ -230,15 +230,15 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
     1.4              break;
     1.5          }
     1.6          
     1.7 -        if ( (op->u.pincpudomain.exec_domain >= MAX_VIRT_CPUS) ||
     1.8 -             !d->exec_domain[op->u.pincpudomain.exec_domain] )
     1.9 +        if ( (op->u.pincpudomain.vcpu >= MAX_VIRT_CPUS) ||
    1.10 +             !d->exec_domain[op->u.pincpudomain.vcpu] )
    1.11          {
    1.12              ret = -EINVAL;
    1.13              put_domain(d);
    1.14              break;
    1.15          }
    1.16  
    1.17 -        ed = d->exec_domain[op->u.pincpudomain.exec_domain];
    1.18 +        ed = d->exec_domain[op->u.pincpudomain.vcpu];
    1.19          if ( ed == NULL )
    1.20          {
    1.21              ret = -ESRCH;
    1.22 @@ -382,14 +382,14 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
    1.23              break;
    1.24          }
    1.25  
    1.26 -        if ( op->u.getvcpucontext.exec_domain >= MAX_VIRT_CPUS )
    1.27 +        if ( op->u.getvcpucontext.vcpu >= MAX_VIRT_CPUS )
    1.28          {
    1.29              ret = -EINVAL;
    1.30              put_domain(d);
    1.31              break;
    1.32          }
    1.33          
    1.34 -        ed = d->exec_domain[op->u.getvcpucontext.exec_domain];
    1.35 +        ed = d->exec_domain[op->u.getvcpucontext.vcpu];
    1.36          if ( ed == NULL )
    1.37          {
    1.38              ret = -ESRCH;
     2.1 --- a/xen/common/domain.c	Thu May 12 15:02:52 2005 +0000
     2.2 +++ b/xen/common/domain.c	Thu May 12 15:25:01 2005 +0000
     2.3 @@ -221,7 +221,7 @@ int set_info_guest(struct domain *d, dom
     2.4  {
     2.5      int rc = 0;
     2.6      struct vcpu_guest_context *c = NULL;
     2.7 -    unsigned long vcpu = setdomaininfo->exec_domain;
     2.8 +    unsigned long vcpu = setdomaininfo->vcpu;
     2.9      struct exec_domain *ed; 
    2.10  
    2.11      if ( (vcpu >= MAX_VIRT_CPUS) || ((ed = d->exec_domain[vcpu]) == NULL) )