debuggers.hg
diff xen/common/physdev.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
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 | c6f1bab39d4f beb0887c54bc |
children | bbe8541361dd 4294cfa9fad3 |
line diff
1.1 --- a/xen/common/physdev.c Wed Feb 02 09:38:32 2005 +0000 1.2 +++ b/xen/common/physdev.c Wed Feb 02 15:24:31 2005 +0000 1.3 @@ -98,7 +98,7 @@ static void add_dev_to_task(struct domai 1.4 return; 1.5 } 1.6 1.7 - if ( (pdev = xmalloc(sizeof(phys_dev_t))) == NULL ) 1.8 + if ( (pdev = xmalloc(phys_dev_t)) == NULL ) 1.9 { 1.10 INFO("Error allocating pdev structure.\n"); 1.11 return; 1.12 @@ -174,7 +174,7 @@ int physdev_pci_access_modify( 1.13 1.14 if ( ed->thread.io_bitmap == NULL ) 1.15 { 1.16 - if ( (ed->thread.io_bitmap = xmalloc(IOBMP_BYTES)) == NULL ) 1.17 + if ( (ed->thread.io_bitmap = xmalloc_array(u8, IOBMP_BYTES)) == NULL ) 1.18 { 1.19 rc = -ENOMEM; 1.20 goto out; 1.21 @@ -765,7 +765,7 @@ void physdev_init_dom0(struct domain *p) 1.22 if ( (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) && 1.23 (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) ) 1.24 continue; 1.25 - pdev = xmalloc(sizeof(phys_dev_t)); 1.26 + pdev = xmalloc(phys_dev_t); 1.27 pdev->dev = dev; 1.28 pdev->flags = ACC_WRITE; 1.29 pdev->state = 0;