debuggers.hg
changeset 654:18c36f61f4cd
bitkeeper revision 1.345 (3f12be5aIxtVNJz4gdn0zwGqyPofFQ)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author | iap10@labyrinth.cl.cam.ac.uk |
---|---|
date | Mon Jul 14 14:29:46 2003 +0000 (2003-07-14) |
parents | 3a237a10a0c6 fc9e10724592 |
children | c085fac641e2 |
files | tools/internal/xi_build.c xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/vfr.c |
line diff
1.1 --- a/tools/internal/xi_build.c Mon Jul 14 14:29:39 2003 +0000 1.2 +++ b/tools/internal/xi_build.c Mon Jul 14 14:29:46 2003 +0000 1.3 @@ -296,8 +296,6 @@ static int setup_guestos( 1.4 /* The last PTE we consider is filled in later by Xen. */ 1.5 if ( count == tot_pages ) break; 1.6 1.7 - printf("%lu: %08lx\n", count, page_array[count]); 1.8 - 1.9 if ( count < pt_start ) 1.10 { 1.11 pgt_updates->ptr = l1tab; 1.12 @@ -323,9 +321,6 @@ static int setup_guestos( 1.13 num_pgt_updates++; 1.14 } 1.15 1.16 - printf("XHDHFDHGFGHFGXXX\n"); 1.17 - sleep(4); 1.18 - 1.19 meminfo->virt_startinfo_addr = 1.20 virt_load_addr + ((alloc_index-1)<<PAGE_SHIFT); 1.21
2.1 --- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/vfr.c Mon Jul 14 14:29:39 2003 +0000 2.2 +++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/vfr.c Mon Jul 14 14:29:46 2003 +0000 2.3 @@ -20,6 +20,8 @@ static struct proc_dir_entry *proc_vfr; 2.4 2.5 static unsigned char readbuf[1024]; 2.6 2.7 +extern struct proc_dir_entry *xeno_base; 2.8 + 2.9 /* Helpers, implemented at the bottom. */ 2.10 u32 getipaddr(const char *buff, unsigned int len); 2.11 u16 antous(const char *buff, int len); 2.12 @@ -224,7 +226,7 @@ static int vfr_write_proc(struct file *f 2.13 static int __init init_module(void) 2.14 { 2.15 *readbuf = '\0'; 2.16 - proc_vfr = create_proc_entry ("xeno/vfr", 0600, &proc_root); 2.17 + proc_vfr = create_proc_entry ("vfr", 0600, xeno_base); 2.18 if ( proc_vfr != NULL ) 2.19 { 2.20 proc_vfr->owner = THIS_MODULE; 2.21 @@ -239,7 +241,7 @@ static int __init init_module(void) 2.22 static void __exit cleanup_module(void) 2.23 { 2.24 if ( proc_vfr == NULL ) return; 2.25 - remove_proc_entry("xeno/vfr", &proc_root); 2.26 + remove_proc_entry("vfr", xeno_base); 2.27 proc_vfr = NULL; 2.28 } 2.29