Merged.

linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c

@@ -114,10 +114,10 @@ static void fast_flush_area(int idx, int nr_pages)
 		handle = pending_handle(idx, i);
 		if (handle == BLKBACK_INVALID_HANDLE)
 			continue;
-		unmap[i].host_addr      = MMAP_VADDR(idx, i);
-		unmap[i].dev_bus_addr   = 0;
-		unmap[i].handle         = handle;
-		pending_handle(idx, i)  = BLKBACK_INVALID_HANDLE;
+		unmap[invcount].host_addr    = MMAP_VADDR(idx, i);
+		unmap[invcount].dev_bus_addr = 0;
+		unmap[invcount].handle       = handle;
+		pending_handle(idx, i) = BLKBACK_INVALID_HANDLE;
 		invcount++;
 	}
 
@@ -498,6 +498,9 @@ static int __init blkif_init(void)
 	struct page *page;
 	int ret;
 
+	for (i = 0; i < MMAP_PAGES; i++)
+		pending_grant_handles[i] = BLKBACK_INVALID_HANDLE;
+
 	blkif_interface_init();
 
 	page = balloon_alloc_empty_page_range(MMAP_PAGES);
@@ -518,8 +521,6 @@ static int __init blkif_init(void)
 
 	blkif_xenbus_init();
 
-	memset(pending_grant_handles,  BLKBACK_INVALID_HANDLE, MMAP_PAGES);
-
 	return 0;
 }
 

tools/python/xen/xm/create.py

@@ -643,7 +643,7 @@ def preprocess_ioports(vals):
     ioports = []
     for v in vals.ioports:
         d = v.split('-')
-        if len(d) < 1 || len(d) > 2:
+        if len(d) < 1 or len(d) > 2:
             err('Invalid i/o port range specifier: ' + v)
         if len(d) == 1:
             d.append(d[0])