direct-io.hg

changeset 187:0de4dd485c77

bitkeeper revision 1.48.1.1 (3e4ea303Y_os0c3q9Ylf9EVtt1eFzw)

Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into labyrinth.cl.cam.ac.uk:/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Sat Feb 15 20:28:51 2003 +0000 (2003-02-15)
parents efb500abaa15 9d2b019847a4
children 27c9e1a4e843 959e09645b6e
files xen-2.4.16/common/domain.c
line diff
     1.1 --- a/xen-2.4.16/common/domain.c	Sat Feb 15 17:38:17 2003 +0000
     1.2 +++ b/xen-2.4.16/common/domain.c	Sat Feb 15 20:28:51 2003 +0000
     1.3 @@ -578,19 +578,16 @@ int setup_guestos(struct task_struct *p,
     1.4          }
     1.5      }
     1.6      *dst = '\0';
     1.7 +//printk("opt_nfsroot=%d,%s XX cmd =: %s\n",opt_nfsroot,opt_nfsroot,virt_startinfo_address->cmd_line);
     1.8  
     1.9 -    if ( opt_nfsroot )
    1.10 -    {
    1.11 +    if ( strcmp("",opt_nfsroot) )
    1.12 +    {   // if nfsroot has been set to something
    1.13          unsigned char boot[150];
    1.14          unsigned char ipbase[20], nfsserv[20], gateway[20], netmask[20];
    1.15          unsigned char nfsroot[70];
    1.16          snprintf(nfsroot, 70, opt_nfsroot, dom); 
    1.17          snprintf(boot, 200,
    1.18 -#if 1
    1.19                  " root=/dev/nfs ip=%s:%s:%s:%s::eth0:off nfsroot=%s",
    1.20 -#else
    1.21 -                " ro root=/dev/xhda7 ip=%s:%s:%s:%s::eth0:off arfle=%s",
    1.22 -#endif
    1.23                   quad_to_str(opt_ipbase + dom, ipbase),
    1.24                   quad_to_str(opt_nfsserv, nfsserv),
    1.25                   quad_to_str(opt_gateway, gateway),
    1.26 @@ -598,6 +595,18 @@ int setup_guestos(struct task_struct *p,
    1.27                   nfsroot);
    1.28          strcpy(dst, boot);
    1.29      }
    1.30 +    else
    1.31 +    {   
    1.32 +        unsigned char boot[150];
    1.33 +        unsigned char ipbase[20], nfsserv[20], gateway[20], netmask[20];
    1.34 +        snprintf(boot, 200,
    1.35 +                " ip=%s::%s:%s::eth0:off",
    1.36 +                 quad_to_str(opt_ipbase + dom, ipbase),
    1.37 +                 quad_to_str(opt_gateway, gateway),
    1.38 +                 quad_to_str(opt_netmask, netmask));
    1.39 +        strcpy(dst, boot);
    1.40 +    }
    1.41 +
    1.42  
    1.43      /* Reinstate the caller's page tables. */
    1.44      __write_cr3_counted(pagetable_val(current->mm.pagetable));