ia64/xen-unstable

changeset 3984:0914061e11ca

bitkeeper revision 1.1236.1.56 (4227b2b4dQ6XlQ1LnHLnW5ENc2B7LA)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
author cl349@firebug.cl.cam.ac.uk
date Fri Mar 04 00:58:28 2005 +0000 (2005-03-04)
parents b40911fea95b 4576c7b7063b
children 807238e9d9f4
files tools/examples/xmexample1 tools/examples/xmexample2 tools/libxc/xc_plan9_build.c
line diff
     1.1 --- a/tools/examples/xmexample1	Thu Mar 03 21:13:27 2005 +0000
     1.2 +++ b/tools/examples/xmexample1	Fri Mar 04 00:58:28 2005 +0000
     1.3 @@ -8,7 +8,7 @@
     1.4  
     1.5  #----------------------------------------------------------------------------
     1.6  # Kernel image file.
     1.7 -kernel = "/boot/vmlinuz-2.6.9-xenU"
     1.8 +kernel = "/boot/vmlinuz-2.6.10-xenU"
     1.9  
    1.10  # Optional ramdisk.
    1.11  #ramdisk = "/boot/initrd.gz"
    1.12 @@ -45,7 +45,7 @@ name = "ExampleDomain"
    1.13  # where UNAME is the device, DEV is the device name the domain will see,
    1.14  # and MODE is r for read-only, w for read-write.
    1.15  
    1.16 -disk = [ 'phy:hda1,hda1,r' ]
    1.17 +disk = [ 'phy:hda1,hda1,w' ]
    1.18  
    1.19  #----------------------------------------------------------------------------
    1.20  # Set the kernel command line for the new domain.
     2.1 --- a/tools/examples/xmexample2	Thu Mar 03 21:13:27 2005 +0000
     2.2 +++ b/tools/examples/xmexample2	Fri Mar 04 00:58:28 2005 +0000
     2.3 @@ -36,7 +36,7 @@ xm_vars.check()
     2.4  
     2.5  #----------------------------------------------------------------------------
     2.6  # Kernel image file.
     2.7 -kernel = "/boot/vmlinuz-2.6.9-xenU"
     2.8 +kernel = "/boot/vmlinuz-2.6.10-xenU"
     2.9  
    2.10  # Optional ramdisk.
    2.11  #ramdisk = "/boot/initrd.gz"