diff -r d0420ab97345 tools/python/xen/util/blkif.py --- a/tools/python/xen/util/blkif.py Fri May 21 16:21:39 2010 +0100 +++ b/tools/python/xen/util/blkif.py Sat May 22 01:21:15 2010 +0400 @@ -87,7 +87,7 @@ fn = "/dev/%s" %(fn,) if typ in ("tap", "tap2"): - (taptype, fn) = fn.split(":", 1) + (taptype, fn) = fn.split(":", 2)[1:] return (fn, taptype) def blkdev_uname_to_file(uname): diff -r d0420ab97345 tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Fri May 21 16:21:39 2010 +0100 +++ b/tools/python/xen/xend/XendDomainInfo.py Sat May 22 01:21:15 2010 +0400 @@ -3292,6 +3292,7 @@ fn = BOOTLOADER_LOOPBACK_DEVICE try: + time.sleep(5) blcfg = bootloader(blexec, fn, self, False, bootloader_args, kernel, ramdisk, args) finally: @@ -3299,7 +3300,7 @@ log.info("Unmounting %s from %s." % (fn, BOOTLOADER_LOOPBACK_DEVICE)) - dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE) + dom0.destroyDevice(devtype, BOOTLOADER_LOOPBACK_DEVICE) if blcfg is None: msg = "Had a bootloader specified, but can't find disk"