[Xen-changelog] [xen-3.4-testing] xend: allow domain creation with multiple empty CD-ROM devices

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1254410167 -3600
# Node ID a154809facf81cc5a708ddf1b566115631af860e
# Parent  d234358df883240ad93598b16b8ca4c3198a0a54
xend: allow domain creation with multiple empty CD-ROM devices

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   20264:6472342c8ab0
xen-unstable date:        Wed Sep 30 08:51:21 2009 +0100
---
 tools/python/xen/xend/XendConfig.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -r d234358df883 -r a154809facf8 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Thu Oct 01 16:15:47 2009 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Thu Oct 01 16:16:07 2009 +0100
@@ -1174,14 +1174,14 @@ 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')
-                    if o_dev_uname != None:
+                    if o_dev_uname and 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)
-                    if dev_uname == o_dev_uname:
-                        raise XendConfigError('The uname "%s" is already 
defined' %
-                                             dev_uname)
+                        if dev_uname and dev_uname == o_dev_uname:
+                            raise XendConfigError('The uname "%s" is already 
defined' %
+                                                  dev_uname)
                     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