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

- Update to Xen 4.0.2 rc2-pre, changeset 21443

Browse Source 
- bnc#633573 - System fail to boot after running several warm
  reboot tests
  22749-vtd-workarounds.patch
- Upstream patches from Jan
  22744-ept-pod-locking.patch
  22777-vtd-ats-fixes.patch
  22781-pod-hap-logdirty.patch
  22782-x86-emul-smsw.patch
  22789-i386-no-x2apic.patch
  22790-svm-resume-migrate-pirqs.patch
  22816-x86-pirq-drop-priv-check.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=94
This commit is contained in:
Charles Arnold
2011-02-04 21:19:54 +00:00
committed by Git OBS Bridge
parent 62de63b129
commit 0c76f22ef1
231 changed files with 2626 additions and 4298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
xen-domUloader.diff
View File

@@ -1,7 +1,7 @@
Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py
+++ xen-4.0.1-testing/tools/python/xen/util/blkif.py
--- xen-4.0.2-testing.orig/tools/python/xen/util/blkif.py
+++ xen-4.0.2-testing/tools/python/xen/util/blkif.py
@@ -71,8 +71,8 @@ def blkdev_segment(name):
'type' : 'Disk' }
return val
@@ -35,10 +35,10 @@ Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
def mount_mode(name):
mode = None
Index: xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py
Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py
--- xen-4.0.2-testing.orig/tools/python/xen/xend/server/DevController.py
+++ xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
@@ -592,6 +592,31 @@ class DevController:
return (Missing, None)
@@ -71,10 +71,10 @@ Index: xen-4.0.1-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-4.0.1-testing/tools/python/xen/xend/XendBootloader.py
Index: xen-4.0.2-testing/tools/python/xen/xend/XendBootloader.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendBootloader.py
+++ xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py
--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendBootloader.py
+++ xen-4.0.2-testing/tools/python/xen/xend/XendBootloader.py
@@ -12,7 +12,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
@@ -112,10 +112,10 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py
log.error(msg)
raise VmError(msg)
Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -37,7 +37,7 @@ from types import StringTypes
import xen.lowlevel.xc
@@ -145,12 +145,13 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
# If this is a drbd volume, check if we need to activate it
if disk.find(":") != -1:
@@ -3245,8 +3249,17 @@ class XendDomainInfo:
@@ -3245,9 +3249,18 @@ class XendDomainInfo:
if state == 'Secondary':
os.system('/sbin/drbdadm primary ' + diskname)
- taptype = blkdev_uname_to_taptype(disk)
- mounted = devtype in ['tap', 'tap2'] and taptype != 'aio' and taptype != 'sync' and not os.stat(fn).st_rdev
mounted_vbd_uuid = 0
+ def _shouldMount(types):
+ if types[0] in ('file', 'phy'):
+ return False
@@ -165,26 +166,28 @@ Index: xen-4.0.1-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
@@ -3262,7 +3275,8 @@ class XendDomainInfo:
@@ -3264,7 +3277,8 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()
- dom0._waitForDeviceUUID(dom0.create_vbd(vbd, disk))
mounted_vbd_uuid = dom0.create_vbd(vbd, disk);
- dom0._waitForDeviceUUID(mounted_vbd_uuid)
+ vbd_uuid = dom0.create_vbd(vbd, disk)
+ dom0._waitForDeviceFrontUUID(vbd_uuid)
fn = BOOTLOADER_LOOPBACK_DEVICE
try:
@@ -3272,8 +3286,10 @@ class XendDomainInfo:
@@ -3274,10 +3288,10 @@ class XendDomainInfo:
if mounted:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))
- _, vbd_info = dom0.info['devices'][mounted_vbd_uuid]
- dom0.destroyDevice(dom0.getBlockDeviceClass(vbd_info['devid']),
- BOOTLOADER_LOOPBACK_DEVICE, force = True)
-
- dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE)
+ if devtype in ['tap', 'tap2']:
+ dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True)
+ else:
+ dom0.destroyDevice('vbd', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True)
if blcfg is None:
msg = "Had a bootloader specified, but can't find disk"
log.error(msg)