ia64/xen-unstable

changeset 4058:8411d5ff23c2

bitkeeper revision 1.1236.21.2 (422f76e3sErbaCNhhldMjyldFfweSg)

Little fixes from Rik van Riel and Anthony Liguori.
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@viper.(none)
date Wed Mar 09 22:21:23 2005 +0000 (2005-03-09)
parents 68c92c165159
children 586e5a7db87a
files xen/common/dom0_ops.c xen/common/grant_table.c
line diff
     1.1 --- a/xen/common/dom0_ops.c	Wed Mar 09 21:06:58 2005 +0000
     1.2 +++ b/xen/common/dom0_ops.c	Wed Mar 09 22:21:23 2005 +0000
     1.3 @@ -114,7 +114,7 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
     1.4      case DOM0_BUILDDOMAIN:
     1.5      {
     1.6          struct domain *d = find_domain_by_id(op->u.builddomain.domain);
     1.7 -        ret = -EINVAL;
     1.8 +        ret = -ESRCH;
     1.9          if ( d != NULL )
    1.10          {
    1.11              ret = final_setup_guest(d, &op->u.builddomain);
    1.12 @@ -147,7 +147,8 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
    1.13          if ( d != NULL )
    1.14          {
    1.15              ret = -EINVAL;
    1.16 -            if ( test_bit(DF_CONSTRUCTED, &d->d_flags) )
    1.17 +            if ( (d != current->domain) && 
    1.18 +                 test_bit(DF_CONSTRUCTED, &d->d_flags) )
    1.19              {
    1.20                  domain_unpause_by_systemcontroller(d);
    1.21                  ret = 0;
     2.1 --- a/xen/common/grant_table.c	Wed Mar 09 21:06:58 2005 +0000
     2.2 +++ b/xen/common/grant_table.c	Wed Mar 09 22:21:23 2005 +0000
     2.3 @@ -345,7 +345,7 @@ gnttab_map_grant_ref(
     2.4      gnttab_map_grant_ref_t *uop, unsigned int count)
     2.5  {
     2.6      int i, flush = 0;
     2.7 -    unsigned long va;
     2.8 +    unsigned long va = 0;
     2.9  
    2.10      for ( i = 0; i < count; i++ )
    2.11          if ( __gnttab_map_grant_ref(&uop[i], &va) == 0)
    2.12 @@ -353,8 +353,9 @@ gnttab_map_grant_ref(
    2.13  
    2.14      if ( flush == 1 )
    2.15          __flush_tlb_one(va);
    2.16 -    else if ( flush )
    2.17 +    else if ( flush != 0 )
    2.18          local_flush_tlb();
    2.19 +
    2.20      return 0;
    2.21  }
    2.22