diff -r b622e411eef8 tools/blktap2/README
--- a/tools/blktap2/README	Thu Jun 24 21:56:03 2010 +0100
+++ b/tools/blktap2/README	Sun Jun 27 17:17:35 2010 +0400
@@ -84,7 +84,7 @@
 followed by the driver type. e.g. for a raw image such as a file or
 partition:
 
-disk = ['tap:tapdisk:aio:<FILENAME>,sda1,w']
+disk = ['tap2:tapdisk:aio:<FILENAME>,sda1,w']
 
 Alternatively, the vhd-util tool (installed with make install, or in
 /blktap2/vhd) can be used to build sparse copy-on-write vhd images.
@@ -108,7 +108,7 @@
 VHD files can be mounted automatically in a guest similarly to the
 above AIO example simply by specifying the vhd driver.
 
-disk = ['tap:tapdisk:vhd:<VHD FILENAME>,sda1,w']
+disk = ['tap2:tapdisk:vhd:<VHD FILENAME>,sda1,w']
 
 
 Snapshots:
diff -r b622e411eef8 tools/python/xen/util/blkif.py
--- a/tools/python/xen/util/blkif.py	Thu Jun 24 21:56:03 2010 +0100
+++ b/tools/python/xen/util/blkif.py	Sun Jun 27 17:17:35 2010 +0400
@@ -87,7 +87,10 @@
                 fn = "/dev/%s" %(fn,)
                
         if typ in ("tap", "tap2"):
-            (taptype, fn) = fn.split(":", 2)[1:3]
+            if fn.count(":") == 1:
+                (taptype, fn) = fn.split(":", 1)
+            else:
+                (taptype, fn) = fn.split(":", 2)[1:3]
     return (fn, taptype)
 
 def blkdev_uname_to_file(uname):