[Xen-devel] [PATCH] Cleanup some dead code in XendConfig

[john.levon@xxxxxxx]

# HG changeset patch
# User john.levon@xxxxxxx
# Date 1169005426 28800
# Node ID 9e244ca38dee0407b69dd82e5b05314064664484
# Parent  ce6684b05b953bf1ef88495883c30485b5407a5b
Cleanup some dead code in XendConfig.

Signed-off-by: John Levon <john.levon@xxxxxxx>

diff --git a/tools/python/xen/xend/XendConfig.py 
b/tools/python/xen/xend/XendConfig.py
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -1118,10 +1118,10 @@ class XendConfig(dict):
 
         # attempt to extract extra arguments from SXP config
         arg_ip = sxp.child_value(image_sxp, 'ip')
-        if arg_ip and not re.search(r'ip=[^ ]+', kernel_args):
+        if arg_ip:
             kernel_args += 'ip=%s ' % arg_ip
         arg_root = sxp.child_value(image_sxp, 'root')
-        if arg_root and not re.search(r'root=', kernel_args):
+        if arg_root:
             kernel_args += 'root=%s ' % arg_root
 
         # user-specified args must come last: previous releases did this and

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