diff -r 370fd9f97c70 tools/python/xen/util/blkif.py --- a/tools/python/xen/util/blkif.py Sat May 22 07:18:16 2010 +0100 +++ b/tools/python/xen/util/blkif.py Mon May 31 20:28:20 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:3] return (fn, taptype) def blkdev_uname_to_file(uname): diff -r 370fd9f97c70 tools/python/xen/xend/XendBootloader.py --- a/tools/python/xen/xend/XendBootloader.py Sat May 22 07:18:16 2010 +0100 +++ b/tools/python/xen/xend/XendBootloader.py Mon May 31 20:28:20 2010 +0400 @@ -38,10 +38,16 @@ msg = "Bootloader isn't executable" log.error(msg) raise VmError(msg) - if not os.access(disk, os.R_OK): - msg = "Disk isn't accessible" - log.error(msg) - raise VmError(msg) + attempt = 0 + while True: + if not os.access(disk, os.R_OK) and attempt > 3: + msg = "Disk isn't accessible" + log.error(msg) + raise VmError(msg) + else: + break + time.sleep(1) + attempt = attempt + 1 if os.uname()[0] == "NetBSD" and disk.startswith('/dev/'): disk = disk.replace("/dev/", "/dev/r") diff -r 370fd9f97c70 tools/python/xen/xend/XendDomainInfo.py --- a/tools/python/xen/xend/XendDomainInfo.py Sat May 22 07:18:16 2010 +0100 +++ b/tools/python/xen/xend/XendDomainInfo.py Mon May 31 20:28:20 2010 +0400 @@ -3269,7 +3269,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"