debuggers.hg

diff xen/arch/x86/shadow.c @ 3658:0ef6e8e6e85d

bitkeeper revision 1.1159.212.71 (4200f0afX_JumfbEHQex6TdFENULMQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk
author iap10@labyrinth.cl.cam.ac.uk
date Wed Feb 02 15:24:31 2005 +0000 (2005-02-02)
parents a4621fab44b4 10a0f6b0a996
children 8472fafee3cf
line diff
     1.1 --- a/xen/arch/x86/shadow.c	Wed Feb 02 09:38:32 2005 +0000
     1.2 +++ b/xen/arch/x86/shadow.c	Wed Feb 02 15:24:31 2005 +0000
     1.3 @@ -176,8 +176,7 @@ int shadow_mode_enable(struct domain *p,
     1.4  {
     1.5      struct mm_struct *m = &p->exec_domain[0]->mm;
     1.6  
     1.7 -    m->shadow_ht = xmalloc(
     1.8 -        shadow_ht_buckets * sizeof(struct shadow_status));
     1.9 +    m->shadow_ht = xmalloc_array(struct shadow_status, shadow_ht_buckets);
    1.10      if ( m->shadow_ht == NULL )
    1.11          goto nomem;
    1.12      memset(m->shadow_ht, 0, shadow_ht_buckets * sizeof(struct shadow_status));
    1.13 @@ -186,7 +185,7 @@ int shadow_mode_enable(struct domain *p,
    1.14      {
    1.15          m->shadow_dirty_bitmap_size = (p->max_pages + 63) & ~63;
    1.16          m->shadow_dirty_bitmap = 
    1.17 -            xmalloc(m->shadow_dirty_bitmap_size/8);
    1.18 +            _xmalloc(m->shadow_dirty_bitmap_size/8);
    1.19          if ( m->shadow_dirty_bitmap == NULL )
    1.20          {
    1.21              m->shadow_dirty_bitmap_size = 0;