[Xen-changelog] [xen-3.2-testing] Fix HVM guest's save/restore by ignoring the null cdrom string

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1220614898 -3600
# Node ID d41b2ba2d9eefaa38f9bb8dece1b4c8a39dcd3d0
# Parent  9750ac9b7e8b64e19971eeb2b697bb97d6ff23fe
Fix HVM guest's save/restore by ignoring the null cdrom string

When we use qcow in hvm config file, like
disk=['tap:qcow:/img/qcow.img,hda,w',',hdc:cdrom,r'],
HVM guest restore would fail.
The patch fixes the issue by ignoring the null cdrom string.

Signed-off-by: Dexuan Cui <dexuan.cui@xxxxxxxxx>
---
 tools/python/xen/xend/XendConfig.py |    5 +++++
 1 files changed, 5 insertions(+)

diff -r 9750ac9b7e8b -r d41b2ba2d9ee tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Wed Sep 03 10:53:33 2008 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Fri Sep 05 12:41:38 2008 +0100
@@ -993,6 +993,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')
+
+                    # Ignore a null cdrom definition string
+                    if o_dev_uname is None:
+                        continue 
+
                     o_blkdev_file = blkdev_uname_to_file(o_dev_uname)
                     if blkdev_file == o_blkdev_file:
                         raise XendConfigError('The file "%s" is already used' %

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