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
21 lines
946 B
Diff
21 lines
946 B
Diff
Index: xen-4.1.2-testing/tools/python/xen/xend/XendConfig.py
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/python/xen/xend/XendConfig.py
|
|
+++ xen-4.1.2-testing/tools/python/xen/xend/XendConfig.py
|
|
@@ -1874,7 +1874,14 @@ class XendConfig(dict):
|
|
ports = sxp.child(dev_sxp, 'port')
|
|
for port in ports[1:]:
|
|
try:
|
|
- num, bus = port
|
|
+ # When ['port' ['1','']] is saved into sxp file, it will become (port (1 ))
|
|
+ # If using this sxp file, here variable "port" will be port=1,
|
|
+ # we should process it, otherwise, it will report error.
|
|
+ if len(port) == 1:
|
|
+ num = port[0]
|
|
+ bus = ""
|
|
+ else:
|
|
+ num, bus = port
|
|
dev_config['port-%i' % int(num)] = str(bus)
|
|
except TypeError:
|
|
pass
|