ia64/xen-unstable

changeset 7655:a05e55c919c1

Merged.
author emellor@leeni.uk.xensource.com
date Mon Nov 07 15:06:27 2005 +0100 (2005-11-07)
parents 12c3b4463cba d1b5ad8e8b03
children b6cce4237ded 781b6dd73e4c ca37f8be9426
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Mon Nov 07 15:06:00 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Mon Nov 07 15:06:27 2005 +0100
     1.3 @@ -114,10 +114,10 @@ static void fast_flush_area(int idx, int
     1.4  		handle = pending_handle(idx, i);
     1.5  		if (handle == BLKBACK_INVALID_HANDLE)
     1.6  			continue;
     1.7 -		unmap[i].host_addr      = MMAP_VADDR(idx, i);
     1.8 -		unmap[i].dev_bus_addr   = 0;
     1.9 -		unmap[i].handle         = handle;
    1.10 -		pending_handle(idx, i)  = BLKBACK_INVALID_HANDLE;
    1.11 +		unmap[invcount].host_addr    = MMAP_VADDR(idx, i);
    1.12 +		unmap[invcount].dev_bus_addr = 0;
    1.13 +		unmap[invcount].handle       = handle;
    1.14 +		pending_handle(idx, i) = BLKBACK_INVALID_HANDLE;
    1.15  		invcount++;
    1.16  	}
    1.17  
    1.18 @@ -498,6 +498,9 @@ static int __init blkif_init(void)
    1.19  	struct page *page;
    1.20  	int ret;
    1.21  
    1.22 +	for (i = 0; i < MMAP_PAGES; i++)
    1.23 +		pending_grant_handles[i] = BLKBACK_INVALID_HANDLE;
    1.24 +
    1.25  	blkif_interface_init();
    1.26  
    1.27  	page = balloon_alloc_empty_page_range(MMAP_PAGES);
    1.28 @@ -518,8 +521,6 @@ static int __init blkif_init(void)
    1.29  
    1.30  	blkif_xenbus_init();
    1.31  
    1.32 -	memset(pending_grant_handles,  BLKBACK_INVALID_HANDLE, MMAP_PAGES);
    1.33 -
    1.34  	return 0;
    1.35  }
    1.36  
     2.1 --- a/tools/python/xen/xm/create.py	Mon Nov 07 15:06:00 2005 +0100
     2.2 +++ b/tools/python/xen/xm/create.py	Mon Nov 07 15:06:27 2005 +0100
     2.3 @@ -643,7 +643,7 @@ def preprocess_ioports(vals):
     2.4      ioports = []
     2.5      for v in vals.ioports:
     2.6          d = v.split('-')
     2.7 -        if len(d) < 1 || len(d) > 2:
     2.8 +        if len(d) < 1 or len(d) > 2:
     2.9              err('Invalid i/o port range specifier: ' + v)
    2.10          if len(d) == 1:
    2.11              d.append(d[0])