800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
# HG changeset patch
|
|
# User Jim Fehlig <jfehlig@novell.com>
|
|
# Date 1284948067 21600
|
|
# Node ID 4674ad11feef87a6a57b99313966e0e121588e1c
|
|
# Parent 5393151a737b023476f4e571effc547e758cf8c8
|
|
xend: Fix device_configure
|
|
|
|
The semantics of XendDomainInfo.py:device_configure() changed with xen upstream
|
|
c/s 19610. Previously this method would take a devid in actual id *or* name
|
|
form, e.g. it would accept '5632' or 'hdc'. This patch restores that behavior.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@novell.com>
|
|
|
|
Index: xen-4.1.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-4.1.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -1203,6 +1203,9 @@ class XendDomainInfo:
|
|
except ValueError:
|
|
pass
|
|
devid = dev_control.convertToDeviceNumber(dev)
|
|
+ else:
|
|
+ # devid could be a name, e.g. hdc
|
|
+ devid = dev_control.convertToDeviceNumber(devid)
|
|
dev_info = self._getDeviceInfo_vbd(devid)
|
|
if dev_info is None:
|
|
raise VmError("Device %s not connected" % devid)
|