[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID a05e55c919c1f765b9b93a0178005c4a19cb471e
# Parent  12c3b4463cba7e1d9949f93d615b8a5584481311
# Parent  d1b5ad8e8b03b5e79d86d0844b46345a0f931390
Merged.

diff -r 12c3b4463cba -r a05e55c919c1 
linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Mon Nov  7 
14:06:00 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Mon Nov  7 
14:06:27 2005
@@ -114,10 +114,10 @@
                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 @@
        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 @@
 
        blkif_xenbus_init();
 
-       memset(pending_grant_handles,  BLKBACK_INVALID_HANDLE, MMAP_PAGES);
-
        return 0;
 }
 
diff -r 12c3b4463cba -r a05e55c919c1 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Mon Nov  7 14:06:00 2005
+++ b/tools/python/xen/xm/create.py     Mon Nov  7 14:06:27 2005
@@ -643,7 +643,7 @@
     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])

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog