# HG changeset patch
# User iap10@labyrinth.cl.cam.ac.uk
# Date 1058192986 0
# Node ID 18c36f61f4cddf314daa0ec7ff8dcfccf4eaec86
# Parent  3a237a10a0c64f2731fa94a98cab7c463644ccf8# Parent  fc9e107245923ed396d2e815fd8ffb97ff4d92a7
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


diff -r 3a237a10a0c6 -r 18c36f61f4cd tools/internal/xi_build.c
--- a/tools/internal/xi_build.c	Mon Jul 14 14:29:39 2003 +0000
+++ b/tools/internal/xi_build.c	Mon Jul 14 14:29:46 2003 +0000
@@ -296,8 +296,6 @@ static int setup_guestos(
         /* The last PTE we consider is filled in later by Xen. */
         if ( count == tot_pages ) break;
 		
-        printf("%lu: %08lx\n", count, page_array[count]);
-
         if ( count < pt_start )
         {
             pgt_updates->ptr = l1tab;
@@ -323,9 +321,6 @@ static int setup_guestos(
         num_pgt_updates++;
     }
 
-    printf("XHDHFDHGFGHFGXXX\n");
-    sleep(4);
-
     meminfo->virt_startinfo_addr =
         virt_load_addr + ((alloc_index-1)<<PAGE_SHIFT);
 
diff -r 3a237a10a0c6 -r 18c36f61f4cd xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/vfr.c
--- a/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/vfr.c	Mon Jul 14 14:29:39 2003 +0000
+++ b/xenolinux-2.4.21-sparse/arch/xeno/drivers/dom0/vfr.c	Mon Jul 14 14:29:46 2003 +0000
@@ -20,6 +20,8 @@ static struct proc_dir_entry *proc_vfr;
 
 static unsigned char readbuf[1024];
 
+extern struct proc_dir_entry *xeno_base;
+
 /* Helpers, implemented at the bottom. */
 u32 getipaddr(const char *buff, unsigned int len);
 u16 antous(const char *buff, int len);
@@ -224,7 +226,7 @@ static int vfr_write_proc(struct file *f
 static int __init init_module(void)
 {
     *readbuf = '\0';
-    proc_vfr = create_proc_entry ("xeno/vfr", 0600, &proc_root);
+    proc_vfr = create_proc_entry ("vfr", 0600, xeno_base);
     if ( proc_vfr != NULL )
     {
         proc_vfr->owner      = THIS_MODULE;
@@ -239,7 +241,7 @@ static int __init init_module(void)
 static void __exit cleanup_module(void)
 {
     if ( proc_vfr == NULL ) return;
-    remove_proc_entry("xeno/vfr", &proc_root);
+    remove_proc_entry("vfr", xeno_base);
     proc_vfr = NULL;
 }