OBS User unknown
2008-10-11 14:22:01 +00:00
committed by Git OBS Bridge
parent b834258fb8
commit 71babd6d75
37 changed files with 1751 additions and 733 deletions

View File

@@ -36,7 +36,7 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/server/DevController.py
===================================================================
--- xen-3.3.1-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-3.3.1-testing/tools/python/xen/xend/server/DevController.py
@@ -604,6 +604,31 @@ class DevController:
@@ -620,6 +620,31 @@ class DevController:
return (Missing, None)
@@ -148,7 +148,7 @@ Index: xen-3.3.1-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
@@ -1897,6 +1897,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.1-testing/tools/python/xen/xend/XendDomainInfo.py
def _waitForDevice_destroy(self, deviceClass, devid, backpath):
return self.getDeviceController(deviceClass).waitForDevice_destroy(
devid, backpath)
@@ -2569,8 +2573,11 @@ class XendDomainInfo:
@@ -2547,8 +2551,11 @@ class XendDomainInfo:
blexec = osdep.pygrub_path
blcfg = None
@@ -173,7 +173,7 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
if not disks:
msg = "Had a bootloader specified, but no disks are bootable"
@@ -2581,13 +2588,10 @@ class XendDomainInfo:
@@ -2559,13 +2566,10 @@ class XendDomainInfo:
devtype = devinfo[0]
disk = devinfo[1]['uname']
@@ -190,7 +190,7 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
log.info("Mounting %s on %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))
@@ -2599,7 +2603,9 @@ class XendDomainInfo:
@@ -2577,7 +2581,9 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()
@@ -201,7 +201,7 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
fn = BOOTLOADER_LOOPBACK_DEVICE
try:
@@ -2610,7 +2616,7 @@ class XendDomainInfo:
@@ -2588,7 +2594,7 @@ class XendDomainInfo:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))