SHA256
1
0
forked from pool/xen

Accepting request 33724 from Virtualization

checked in (request 33724)

OBS-URL: https://build.opensuse.org/request/show/33724
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=33
This commit is contained in:
OBS User autobuild
2010-03-02 00:46:54 +00:00
committed by Git OBS Bridge
parent 8b260f874c
commit 7d0b7344dd
56 changed files with 307 additions and 11859 deletions

View File

@@ -123,7 +123,7 @@ Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
import xen.util.xsm.xsm as security
from xen.util import xsconstants
from xen.util import mkdir
@@ -2342,6 +2342,10 @@ class XendDomainInfo:
@@ -2320,6 +2320,10 @@ class XendDomainInfo:
deviceClass, config = self.info['devices'].get(dev_uuid)
self._waitForDevice(deviceClass, config['devid'])
@@ -134,7 +134,7 @@ Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
def _waitForDevice_destroy(self, deviceClass, devid, backpath):
return self.getDeviceController(deviceClass).waitForDevice_destroy(
devid, backpath)
@@ -3230,7 +3234,7 @@ class XendDomainInfo:
@@ -3206,7 +3210,7 @@ class XendDomainInfo:
devtype = devinfo[0]
disk = devinfo[1]['uname']
@@ -143,7 +143,7 @@ Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
# If this is a drbd volume, check if we need to activate it
if disk.find(":") != -1:
@@ -3241,8 +3245,17 @@ class XendDomainInfo:
@@ -3217,8 +3221,17 @@ class XendDomainInfo:
if state == 'Secondary':
os.system('/sbin/drbdadm primary ' + diskname)
@@ -163,7 +163,7 @@ Index: xen-4.0.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
@@ -3258,7 +3271,8 @@ class XendDomainInfo:
@@ -3234,7 +3247,8 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()
@@ -173,7 +173,7 @@ Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py
fn = BOOTLOADER_LOOPBACK_DEVICE
try:
@@ -3268,8 +3282,10 @@ class XendDomainInfo:
@@ -3244,8 +3258,10 @@ class XendDomainInfo:
if mounted:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))