aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@xensource.com>2007-07-02 08:42:13 +0100
committerIan Campbell <ian.campbell@xensource.com>2007-07-02 08:42:13 +0100
commit4cb346f848a1e0748b03582e91c29c7e757ecb0a (patch)
treea253284364a85f4ebab4601865c4debbbd77dba0 /tools
parentd0e4f15cfdad64de400ab32ab544f5434b38c9f7 (diff)
downloadxen-4cb346f848a1e0748b03582e91c29c7e757ecb0a.tar.gz
xen-4cb346f848a1e0748b03582e91c29c7e757ecb0a.tar.bz2
xen-4cb346f848a1e0748b03582e91c29c7e757ecb0a.zip
Fix 15435:ab95b9764b20.
The changeset did not consider about ":cdrom" and "ioemu:" of a disk definition. Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/python/xen/xend/XendConfig.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index 16ebea6f09..17628f337a 100644
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -936,6 +936,13 @@ class XendConfig(dict):
return sxpr
def _blkdev_name_to_number(self, dev):
+ if 'ioemu:' in dev:
+ _, dev = dev.split(':', 1)
+ try:
+ dev, _ = dev.split(':', 1)
+ except ValueError:
+ pass
+
try:
devid = int(dev)
except ValueError: