[Xen-changelog] [xen-unstable] Fix 15435:ab95b9764b20.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1183362133 -3600
# Node ID 182446677b6b56d58523050a6225a73d87a86ab7
# Parent  93b9161fc92095241b4566f510aeb34ffff27f55
Fix 15435:ab95b9764b20.

The changeset did not consider about ":cdrom" and "ioemu:"
of a disk definition.

Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    7 +++++++
 1 files changed, 7 insertions(+)

diff -r 93b9161fc920 -r 182446677b6b tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Mon Jul 02 00:24:59 2007 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Mon Jul 02 08:42:13 2007 +0100
@@ -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:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog