[Xen-devel] [PATCH] xend: Don't call decode() if PV_{kernel, ramdisk} are ''

[Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>]

Hi,

I detected the following messages in xend.log.  The messages are shown 
when I started xend or guest domains.

[2009-07-23 11:04:30 3740] DEBUG (fileuri:260) Decode throws an error: 
'"'data:' scheme declaration missing"'
[2009-07-23 11:04:30 3740] DEBUG (fileuri:260) Decode throws an error: ''no 
file:// scheme found''
[2009-07-23 11:04:30 3740] DEBUG (fileuri:260) Decode throws an error: 
'"'data:' scheme declaration missing"'
[2009-07-23 11:04:30 3740] DEBUG (fileuri:260) Decode throws an error: ''no 
file:// scheme found''

The messages are not shown by the following patch.
I think that a default value of PV_{kernel, ramdisk} is '', not None.
decode() is not called by the patch if the value of PV_{kernel, ramdisk} 
is '' or None.

diff -r 9ced12c28e05 tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py       Wed Jul 22 14:37:30 2009 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Thu Jul 23 11:15:59 2009 +0900
@@ -2087,7 +2087,7 @@
     def handle_fileuris(self):
         for arg in [('PV_kernel', 'use_tmp_kernel'), 
                     ('PV_ramdisk', 'use_tmp_ramdisk')]:
-            if self[arg[0]] != None:
+            if self[arg[0]]:
                 self[arg[0]], self[arg[1]] \
                     = xen.util.fileuri.schemes.decode(self[arg[0]])
                 log.debug("fileuri '%s' = '%s'" % (arg[0], self[arg[0]][:100]))


Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>

Best regards,
 Kan

Attachment: fileuri.patch
Description: Binary data

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