- Update to Xen 4.0.2 rc2-pre, changeset 21443
- 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:
committed by
Git OBS Bridge
parent
62de63b129
commit
0c76f22ef1
@@ -5,10 +5,10 @@ bootloader loopback device. This patch creates a list of bootloader
|
||||
loopback devices so more than one instance of bootloader can be run
|
||||
concurrently.
|
||||
|
||||
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
|
||||
@@ -19,11 +19,6 @@ def blkdev_name_to_number(name):
|
||||
devname = 'virtual-device'
|
||||
devnum = None
|
||||
@@ -21,10 +21,10 @@ Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
|
||||
scsi_major = [ 8, 65, 66, 67, 68, 69, 70, 71, 128, 129, 130, 131, 132, 133, 134, 135 ]
|
||||
if re.match( '/dev/sd[a-z]([1-9]|1[0-5])?$', n):
|
||||
major = scsi_major[(ord(n[7:8]) - ord('a')) / 16]
|
||||
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
|
||||
@@ -73,7 +73,7 @@ from xen.xend.XendPSCSI import XendPSCSI
|
||||
from xen.xend.XendDSCSI import XendDSCSI, XendDSCSI_HBA
|
||||
|
||||
@@ -34,7 +34,7 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
|
||||
xc = xen.lowlevel.xc.xc()
|
||||
xoptions = XendOptions.instance()
|
||||
@@ -3304,20 +3304,27 @@ class XendDomainInfo:
|
||||
@@ -3305,33 +3305,38 @@ class XendDomainInfo:
|
||||
# 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
|
||||
# used through blktap, then we need to mount it first.
|
||||
@@ -49,9 +49,11 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
-
|
||||
- from xen.xend import XendDomain
|
||||
- dom0 = XendDomain.instance().privilegedDomain()
|
||||
- mounted_vbd_uuid = dom0.create_vbd(vbd, disk);
|
||||
- vbd_uuid = dom0.create_vbd(vbd, disk)
|
||||
- dom0._waitForDeviceFrontUUID(vbd_uuid)
|
||||
- fn = BOOTLOADER_LOOPBACK_DEVICE
|
||||
-
|
||||
+ # Try all possible loopback_devices
|
||||
+ for loopback_device in BOOTLOADER_LOOPBACK_DEVICES:
|
||||
+ log.info("Mounting %s on %s." % (fn, loopback_device))
|
||||
@@ -73,10 +75,9 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
+ raise
|
||||
+ else:
|
||||
+ raise
|
||||
|
||||
try:
|
||||
blcfg = bootloader(blexec, fn, self, False,
|
||||
@@ -3325,11 +3332,11 @@ class XendDomainInfo:
|
||||
bootloader_args, kernel, ramdisk, args)
|
||||
finally:
|
||||
if mounted:
|
||||
log.info("Unmounting %s from %s." %
|
||||
@@ -88,6 +89,6 @@ Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
else:
|
||||
- dom0.destroyDevice('vbd', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True)
|
||||
+ dom0.destroyDevice('vbd', loopback_device, rm_cfg = True)
|
||||
|
||||
if blcfg is None:
|
||||
msg = "Had a bootloader specified, but can't find disk"
|
||||
log.error(msg)
|
||||
|
Reference in New Issue
Block a user