OBS User unknown
2008-02-02 00:58:27 +00:00
committed by Git OBS Bridge
parent 622c859b48
commit 3c15755877
44 changed files with 4840 additions and 2385 deletions

View File

@@ -147,7 +147,7 @@ Index: xen-3.2-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
@@ -1484,6 +1484,10 @@ class XendDomainInfo:
@@ -1498,6 +1498,10 @@ class XendDomainInfo:
deviceClass, config = self.info['devices'].get(dev_uuid)
self._waitForDevice(deviceClass, config['devid'])
@@ -158,7 +158,7 @@ Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
def _waitForDevice_destroy(self, deviceClass, devid, backpath):
return self.getDeviceController(deviceClass).waitForDevice_destroy(
devid, backpath)
@@ -2012,8 +2016,11 @@ class XendDomainInfo:
@@ -2026,8 +2030,11 @@ class XendDomainInfo:
blexec = osdep.pygrub_path
blcfg = None
@@ -172,7 +172,7 @@ Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
if not disks:
msg = "Had a bootloader specified, but no disks are bootable"
@@ -2024,13 +2031,10 @@ class XendDomainInfo:
@@ -2038,13 +2045,10 @@ class XendDomainInfo:
devtype = devinfo[0]
disk = devinfo[1]['uname']
@@ -189,7 +189,7 @@ Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
log.info("Mounting %s on %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))
@@ -2042,7 +2046,9 @@ class XendDomainInfo:
@@ -2056,7 +2060,9 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()