ia64/xen-unstable

changeset 5683:43e8e30cbea7

manual merge
author iap10@freefall.cl.cam.ac.uk
date Wed Jul 06 18:19:06 2005 +0000 (2005-07-06)
parents 4b30296d6f5d b522a3a4d525
children 33373e428c9d
files .hgignore buildconfigs/mk.linux-2.6-xen extras/mini-os/Makefile extras/mini-os/events.c extras/mini-os/hypervisor.c extras/mini-os/include/events.h extras/mini-os/include/hypervisor.h extras/mini-os/include/lib.h extras/mini-os/include/mm.h extras/mini-os/include/os.h extras/mini-os/include/time.h extras/mini-os/include/traps.h extras/mini-os/include/types.h extras/mini-os/kernel.c extras/mini-os/time.c extras/mini-os/traps.c extras/mini-os/x86_32.S linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6.11-xen-sparse/arch/xen/configs/xen_defconfig_x86_32 linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c tools/libxc/xc_linux_build.c xen/Makefile
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c	Wed Jul 06 17:28:12 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c	Wed Jul 06 18:19:06 2005 +0000
     1.3 @@ -219,9 +219,7 @@ void blkif_connect(blkif_be_connect_t *c
     1.4          op.ref            = ref;
     1.5          op.dom            = domid;
     1.6         
     1.7 -        if(unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))) {
     1.8 -            BUG();
     1.9 -        }
    1.10 +        BUG_ON( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1) );
    1.11         
    1.12          handle = op.handle;
    1.13         
    1.14 @@ -232,10 +230,6 @@ void blkif_connect(blkif_be_connect_t *c
    1.15              return;
    1.16          }
    1.17  
    1.18 -        phys_to_machine_mapping[__pa(VMALLOC_VMADDR(vma->addr)) >>
    1.19 -                                PAGE_SHIFT] =
    1.20 -                      FOREIGN_FRAME(shmem_frame);
    1.21 -
    1.22          blkif->shmem_ref = ref;
    1.23          blkif->shmem_handle = handle;
    1.24          blkif->shmem_vaddr = VMALLOC_VMADDR(vma->addr);
     2.1 --- a/tools/libxc/xc_linux_build.c	Wed Jul 06 17:28:12 2005 +0000
     2.2 +++ b/tools/libxc/xc_linux_build.c	Wed Jul 06 18:19:06 2005 +0000
     2.3 @@ -129,16 +129,16 @@ static int setup_guest(int xc_handle,
     2.4      vinitrd_end      = vinitrd_start + initrd_len;
     2.5      vphysmap_start   = round_pgup(vinitrd_end);
     2.6      vphysmap_end     = vphysmap_start + (nr_pages * sizeof(unsigned long));
     2.7 -    vpt_start        = round_pgup(vphysmap_end);
     2.8 +    vstoreinfo_start = round_pgup(vphysmap_end);
     2.9 +    vstoreinfo_end   = vstoreinfo_start + PAGE_SIZE;
    2.10 +    vpt_start        = vstoreinfo_end; 
    2.11 +
    2.12      for ( nr_pt_pages = 2; ; nr_pt_pages++ )
    2.13      {
    2.14          vpt_end          = vpt_start + (nr_pt_pages * PAGE_SIZE);
    2.15          vstartinfo_start = vpt_end;
    2.16          vstartinfo_end   = vstartinfo_start + PAGE_SIZE;
    2.17 -        /* Place store shared page after startinfo. */
    2.18 -        vstoreinfo_start = vstartinfo_end;
    2.19 -        vstoreinfo_end   = vstartinfo_end + PAGE_SIZE;
    2.20 -        vstack_start     = vstoreinfo_end;
    2.21 +        vstack_start     = vstartinfo_end;
    2.22          vstack_end       = vstack_start + PAGE_SIZE;
    2.23          v_end            = (vstack_end + (1UL<<22)-1) & ~((1UL<<22)-1);
    2.24          if ( (v_end - vstack_end) < (512UL << 10) )
    2.25 @@ -167,17 +167,17 @@ static int setup_guest(int xc_handle,
    2.26             " Loaded kernel: %p->%p\n"
    2.27             " Init. ramdisk: %p->%p\n"
    2.28             " Phys-Mach map: %p->%p\n"
    2.29 +           " Store page:    %p->%p\n"
    2.30             " Page tables:   %p->%p\n"
    2.31             " Start info:    %p->%p\n"
    2.32 -           " Store page:    %p->%p\n"
    2.33             " Boot stack:    %p->%p\n"
    2.34             " TOTAL:         %p->%p\n",
    2.35             _p(dsi.v_kernstart), _p(dsi.v_kernend), 
    2.36             _p(vinitrd_start), _p(vinitrd_end),
    2.37             _p(vphysmap_start), _p(vphysmap_end),
    2.38 +           _p(vstoreinfo_start), _p(vstoreinfo_end),
    2.39             _p(vpt_start), _p(vpt_end),
    2.40             _p(vstartinfo_start), _p(vstartinfo_end),
    2.41 -           _p(vstoreinfo_start), _p(vstoreinfo_end),
    2.42             _p(vstack_start), _p(vstack_end),
    2.43             _p(dsi.v_start), _p(v_end));
    2.44      printf(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry));