# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1276597771 -3600
# Node ID 3544bdd56c32e2ccf60fc4cc52225da6e49cf33d
# Parent 3903d95733f702d23b92dbaeec515cf31db860d3
Revert 21190:d6470041aa2e (xen-unstable 21541:7ff0e885b5c3).
Caused regressions in Intel's RC2 testing when parsing domain config
files.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/python/xen/util/blkif.py | 2 +-
tools/python/xen/xend/XendBootloader.py | 13 ++++---------
tools/python/xen/xend/XendDomainInfo.py | 2 +-
3 files changed, 6 insertions(+), 11 deletions(-)
diff -r 3903d95733f7 -r 3544bdd56c32 tools/python/xen/util/blkif.py
--- a/tools/python/xen/util/blkif.py Fri Jun 11 14:04:36 2010 +0100
+++ b/tools/python/xen/util/blkif.py Tue Jun 15 11:29:31 2010 +0100
@@ -87,7 +87,7 @@ def _parse_uname(uname):
fn = "/dev/%s" %(fn,)
if typ in ("tap", "tap2"):
- (taptype, fn) = fn.split(":", 2)[1:3]
+ (taptype, fn) = fn.split(":", 1)
return (fn, taptype)
def blkdev_uname_to_file(uname):
diff -r 3903d95733f7 -r 3544bdd56c32 tools/python/xen/xend/XendBootloader.py
--- a/tools/python/xen/xend/XendBootloader.py Fri Jun 11 14:04:36 2010 +0100
+++ b/tools/python/xen/xend/XendBootloader.py Tue Jun 15 11:29:31 2010 +0100
@@ -38,15 +38,10 @@ def bootloader(blexec, disk, dom, quiet
msg = "Bootloader isn't executable"
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
- attempt = attempt + 1
+ if not os.access(disk, os.R_OK):
+ msg = "Disk isn't accessible"
+ log.error(msg)
+ raise VmError(msg)
if os.uname()[0] == "NetBSD" and disk.startswith('/dev/'):
disk = disk.replace("/dev/", "/dev/r")
diff -r 3903d95733f7 -r 3544bdd56c32 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py Fri Jun 11 14:04:36 2010 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py Tue Jun 15 11:29:31 2010 +0100
@@ -3269,7 +3269,7 @@ class XendDomainInfo:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))
- dom0.destroyDevice(devtype, BOOTLOADER_LOOPBACK_DEVICE,
force = True)
+ dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE)
if blcfg is None:
msg = "Had a bootloader specified, but can't find disk"
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home