[Xen-changelog] [xen-unstable] xend: Fix bugzilla bug #1253.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1211289512 -3600
# Node ID 4b4b829e34a233b5b9d1d3112cad069da58d9517
# Parent  fd5b2ed9574afefe582d3985fc868abad6c76254
xend: Fix bugzilla bug #1253.
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r fd5b2ed9574a -r 4b4b829e34a2 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Tue May 20 14:17:15 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Tue May 20 14:18:32 2008 +0100
@@ -1143,10 +1143,11 @@ class XendConfig(dict):
                 if o_dev_type == 'vbd' or o_dev_type == 'tap':
                     blkdev_file = blkdev_uname_to_file(dev_uname)
                     o_dev_uname = sxp.child_value(o_dev_info, 'uname')
-                    o_blkdev_file = blkdev_uname_to_file(o_dev_uname)
-                    if blkdev_file == o_blkdev_file:
-                        raise XendConfigError('The file "%s" is already used' %
-                                              blkdev_file)
+                    if o_dev_uname != None:
+                        o_blkdev_file = blkdev_uname_to_file(o_dev_uname)
+                        if blkdev_file == o_blkdev_file:
+                            raise XendConfigError('The file "%s" is already 
used' %
+                                                  blkdev_file)
                     o_blkdev_name = sxp.child_value(o_dev_info, 'dev')
                     o_devid = self._blkdev_name_to_number(o_blkdev_name)
                     if o_devid != None and devid == o_devid:

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