pool/xen
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=41

Browse Source
This commit is contained in:
OBS User unknown
2008-03-14 23:07:14 +00:00
committed by Git OBS Bridge
parent 0ef5182655
commit 9c16971e0e
65 changed files with 3459 additions and 1613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
xen-domUloader.diff
View File

@@ -1,7 +1,7 @@
Index: xen-3.2-testing/tools/python/xen/util/blkif.py
Index: xen-3.2.1-testing/tools/python/xen/util/blkif.py
===================================================================
--- xen-3.2-testing.orig/tools/python/xen/util/blkif.py
+++ xen-3.2-testing/tools/python/xen/util/blkif.py
--- xen-3.2.1-testing.orig/tools/python/xen/util/blkif.py
+++ xen-3.2.1-testing/tools/python/xen/util/blkif.py
@@ -66,23 +66,24 @@ def blkdev_segment(name):
'type' : 'Disk' }
return val
@@ -32,11 +32,11 @@ Index: xen-3.2-testing/tools/python/xen/util/blkif.py
def mount_mode(name):
mode = None
Index: xen-3.2-testing/tools/python/xen/xend/server/DevController.py
Index: xen-3.2.1-testing/tools/python/xen/xend/server/DevController.py
===================================================================
--- xen-3.2-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-3.2-testing/tools/python/xen/xend/server/DevController.py
@@ -561,6 +561,31 @@ class DevController:
--- xen-3.2.1-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-3.2.1-testing/tools/python/xen/xend/server/DevController.py
@@ -562,6 +562,31 @@ class DevController:
return result['status']
@@ -68,10 +68,10 @@ Index: xen-3.2-testing/tools/python/xen/xend/server/DevController.py
def backendPath(self, backdom, devid):
"""Construct backend path given the backend domain and device id.
Index: xen-3.2-testing/tools/python/xen/xend/XendBootloader.py
Index: xen-3.2.1-testing/tools/python/xen/xend/XendBootloader.py
===================================================================
--- xen-3.2-testing.orig/tools/python/xen/xend/XendBootloader.py
+++ xen-3.2-testing/tools/python/xen/xend/XendBootloader.py
--- xen-3.2.1-testing.orig/tools/python/xen/xend/XendBootloader.py
+++ xen-3.2.1-testing/tools/python/xen/xend/XendBootloader.py
@@ -12,8 +12,9 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
@@ -126,10 +126,10 @@ Index: xen-3.2-testing/tools/python/xen/xend/XendBootloader.py
+ if m:
+ return vdisk == m.group(1) or vdisk == m.group(2)
+ return True
Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
Index: xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-3.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
--- xen-3.2.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -35,14 +35,14 @@ from types import StringTypes
import xen.lowlevel.xc
@@ -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
@@ -1512,6 +1512,10 @@ class XendDomainInfo:
@@ -1517,6 +1517,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)
@@ -2050,8 +2054,11 @@ class XendDomainInfo:
@@ -2091,8 +2095,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"
@@ -2062,13 +2069,10 @@ class XendDomainInfo:
@@ -2103,13 +2110,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))
@@ -2080,7 +2084,9 @@ class XendDomainInfo:
@@ -2121,7 +2125,9 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()
@@ -200,7 +200,7 @@ Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
fn = BOOTLOADER_LOOPBACK_DEVICE
try:
@@ -2091,7 +2097,7 @@ class XendDomainInfo:
@@ -2132,7 +2138,7 @@ class XendDomainInfo:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))