Accepting request 49271 from Virtualization

checked in (request 49271)

OBS-URL: https://build.opensuse.org/request/show/49271
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=75
This commit is contained in:
OBS User autobuild
2010-09-27 22:07:20 +00:00
committed by Git OBS Bridge
parent 7e89789f0a
commit 06b9899ef9
186 changed files with 5183 additions and 2357 deletions

View File

@@ -1,7 +1,7 @@
Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
Index: xen-4.0.0-testing/tools/python/xen/util/blkif.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py
+++ xen-4.0.1-testing/tools/python/xen/util/blkif.py
--- xen-4.0.0-testing.orig/tools/python/xen/util/blkif.py
+++ xen-4.0.0-testing/tools/python/xen/util/blkif.py
@@ -71,8 +71,8 @@ def blkdev_segment(name):
'type' : 'Disk' }
return val
@@ -35,10 +35,10 @@ Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
def mount_mode(name):
mode = None
Index: xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py
Index: xen-4.0.0-testing/tools/python/xen/xend/server/DevController.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py
--- xen-4.0.0-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-4.0.0-testing/tools/python/xen/xend/server/DevController.py
@@ -592,6 +592,31 @@ class DevController:
return (Missing, None)
@@ -71,10 +71,10 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py
def backendPath(self, backdom, devid):
"""Construct backend path given the backend domain and device id.
Index: xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py
Index: xen-4.0.0-testing/tools/python/xen/xend/XendBootloader.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendBootloader.py
+++ xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py
--- xen-4.0.0-testing.orig/tools/python/xen/xend/XendBootloader.py
+++ xen-4.0.0-testing/tools/python/xen/xend/XendBootloader.py
@@ -12,7 +12,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
@@ -101,21 +101,21 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py
+ raise VmError(msg)
+
+ avail = False
+ for i in xrange(1, 100):
+ for i in xrange(1, 20):
+ avail = os.access(disk, os.R_OK)
+ if avail:
+ break
+ time.sleep(.1)
+ time.sleep(.05)
+
+ if not avail:
+ msg = "Disk '%s' isn't accessible" % disk
log.error(msg)
raise VmError(msg)
Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
--- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -37,7 +37,7 @@ from types import StringTypes
import xen.lowlevel.xc