ia64/xen-unstable

changeset 4076:afa2f6b47e70

bitkeeper revision 1.1236.1.75 (4230715amFhBlsGlZ_IAsONxYJw8Dw)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Thu Mar 10 16:10:02 2005 +0000 (2005-03-10)
parents fbad927100bc 013c95ccecee
children c5afd0448d79 ac47854d261f bd0c28f54450
files linux-2.4.29-xen-sparse/arch/xen/mm/init.c linux-2.6.10-xen-sparse/drivers/xen/console/console.c tools/python/xen/xend/server/SrvDaemon.py
line diff
     1.1 --- a/linux-2.4.29-xen-sparse/arch/xen/mm/init.c	Thu Mar 10 15:39:32 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/mm/init.c	Thu Mar 10 16:10:02 2005 +0000
     1.3 @@ -223,10 +223,9 @@ static void __init pagetable_init (void)
     1.4      pmd_t *kpmd, *pmd;
     1.5      pte_t *kpte, *pte, *pte_base;
     1.6  
     1.7 -    end     = (unsigned long)__va(max_low_pfn * PAGE_SIZE);
     1.8 -    ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE);
     1.9 -    if ( ram_end > end )
    1.10 -        ram_end = end;
    1.11 +    ram_end = end = (unsigned long)__va(max_low_pfn * PAGE_SIZE);
    1.12 +    if ( xen_start_info.nr_pages < max_low_pfn )
    1.13 +        ram_end = (unsigned long)__va(xen_start_info.nr_pages * PAGE_SIZE);
    1.14  
    1.15      pgd_base = init_mm.pgd;
    1.16      i = __pgd_offset(PAGE_OFFSET);
     2.1 --- a/linux-2.6.10-xen-sparse/drivers/xen/console/console.c	Thu Mar 10 15:39:32 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/drivers/xen/console/console.c	Thu Mar 10 16:10:02 2005 +0000
     2.3 @@ -66,10 +66,6 @@ static enum { XC_OFF, XC_DEFAULT, XC_TTY
     2.4  
     2.5  static int __init xencons_setup(char *str)
     2.6  {
     2.7 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
     2.8 -    if (str[0] == '=')
     2.9 -	str++;
    2.10 -#endif
    2.11      if ( !strcmp(str, "tty") )
    2.12          xc_mode = XC_TTY;
    2.13      else if ( !strcmp(str, "ttyS") )
    2.14 @@ -78,7 +74,7 @@ static int __init xencons_setup(char *st
    2.15          xc_mode = XC_OFF;
    2.16      return 1;
    2.17  }
    2.18 -__setup("xencons", xencons_setup);
    2.19 +__setup("xencons=", xencons_setup);
    2.20  
    2.21  /* The kernel and user-land drivers share a common transmit buffer. */
    2.22  #define WBUF_SIZE     4096
     3.1 --- a/tools/python/xen/xend/server/SrvDaemon.py	Thu Mar 10 15:39:32 2005 +0000
     3.2 +++ b/tools/python/xen/xend/server/SrvDaemon.py	Thu Mar 10 16:10:02 2005 +0000
     3.3 @@ -15,6 +15,7 @@ import pwd
     3.4  import re
     3.5  import StringIO
     3.6  import traceback
     3.7 +import time
     3.8  
     3.9  from twisted.internet import pollreactor
    3.10  pollreactor.install()
    3.11 @@ -518,8 +519,8 @@ class Daemon:
    3.12          self.install_child_reaper()
    3.13  
    3.14          if self.fork_pid(XEND_PID_FILE):
    3.15 -            #Parent
    3.16 -            pass
    3.17 +            #Parent. Sleep to give child time to start.
    3.18 +            time.sleep(1)
    3.19          else:
    3.20              # Child
    3.21              self.tracing(trace)