SHA256
1
0
forked from pool/xen
OBS User unknown
2008-08-17 22:24:29 +00:00
committed by Git OBS Bridge
parent f5d6338f4d
commit 8cefe055e5
67 changed files with 1102 additions and 2615 deletions

View File

@@ -9,7 +9,7 @@ Index: xen-3.3.0-testing/tools/python/xen/util/blkif.py
-def _parse_uname(uname):
- fn = taptype = None
+def parse_uname(uname):
+ fn = tpy = taptype = None
+ fn = typ = taptype = None
if uname.find(":") != -1:
(typ, fn) = uname.split(":", 1)
if typ == "phy" and not fn.startswith("/"):
@@ -36,7 +36,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/DevController.py
===================================================================
--- xen-3.3.0-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-3.3.0-testing/tools/python/xen/xend/server/DevController.py
@@ -604,6 +604,31 @@ class DevController:
@@ -612,6 +612,31 @@ class DevController:
return (Missing, None)
@@ -148,7 +148,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
from xen.xend.XendError import XendError, VmError
from xen.xend.XendDevices import XendDevices
from xen.xend.XendTask import XendTask
@@ -1863,6 +1863,10 @@ class XendDomainInfo:
@@ -1875,6 +1875,10 @@ class XendDomainInfo:
deviceClass, config = self.info['devices'].get(dev_uuid)
self._waitForDevice(deviceClass, config['devid'])
@@ -159,7 +159,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
def _waitForDevice_destroy(self, deviceClass, devid, backpath):
return self.getDeviceController(deviceClass).waitForDevice_destroy(
devid, backpath)
@@ -2534,8 +2538,11 @@ class XendDomainInfo:
@@ -2557,8 +2561,11 @@ class XendDomainInfo:
blexec = osdep.pygrub_path
blcfg = None
@@ -173,7 +173,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
if not disks:
msg = "Had a bootloader specified, but no disks are bootable"
@@ -2546,13 +2553,10 @@ class XendDomainInfo:
@@ -2569,13 +2576,10 @@ class XendDomainInfo:
devtype = devinfo[0]
disk = devinfo[1]['uname']
@@ -190,7 +190,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
log.info("Mounting %s on %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))
@@ -2564,7 +2568,9 @@ class XendDomainInfo:
@@ -2587,7 +2591,9 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()
@@ -201,7 +201,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
fn = BOOTLOADER_LOOPBACK_DEVICE
try:
@@ -2575,7 +2581,7 @@ class XendDomainInfo:
@@ -2598,7 +2604,7 @@ class XendDomainInfo:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))