This commit is contained in:
committed by
Git OBS Bridge
parent
0bb51565d6
commit
5be0f1bcb4
@@ -122,7 +122,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
import xen.util.xsm.xsm as security
|
||||
from xen.util import xsconstants
|
||||
|
||||
@@ -2134,6 +2134,10 @@ class XendDomainInfo:
|
||||
@@ -2135,6 +2135,10 @@ class XendDomainInfo:
|
||||
deviceClass, config = self.info['devices'].get(dev_uuid)
|
||||
self._waitForDevice(deviceClass, config['devid'])
|
||||
|
||||
@@ -133,7 +133,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
def _waitForDevice_destroy(self, deviceClass, devid, backpath):
|
||||
return self.getDeviceController(deviceClass).waitForDevice_destroy(
|
||||
devid, backpath)
|
||||
@@ -2892,9 +2896,19 @@ class XendDomainInfo:
|
||||
@@ -2893,9 +2897,19 @@ class XendDomainInfo:
|
||||
devtype = devinfo[0]
|
||||
disk = devinfo[1]['uname']
|
||||
|
||||
@@ -156,7 +156,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
if mounted:
|
||||
# This is a file, not a device. pygrub can cope with a
|
||||
# file if it's raw, but if it's QCOW or other such formats
|
||||
@@ -2910,7 +2924,9 @@ class XendDomainInfo:
|
||||
@@ -2911,7 +2925,9 @@ class XendDomainInfo:
|
||||
|
||||
from xen.xend import XendDomain
|
||||
dom0 = XendDomain.instance().privilegedDomain()
|
||||
@@ -167,7 +167,7 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
fn = BOOTLOADER_LOOPBACK_DEVICE
|
||||
|
||||
try:
|
||||
@@ -2920,8 +2936,10 @@ class XendDomainInfo:
|
||||
@@ -2921,8 +2937,10 @@ class XendDomainInfo:
|
||||
if mounted:
|
||||
log.info("Unmounting %s from %s." %
|
||||
(fn, BOOTLOADER_LOOPBACK_DEVICE))
|
||||
|
Reference in New Issue
Block a user