# HG changeset patch
# User john.levon@sun.com
# Date 1168013289 28800
# Node ID 70d8db84401c344fa3e99e2cacb1431555c99ce4
# Parent 476bb3dead3c43a38dc06a1cde6d2ac0bd1ad1e8
Cleanup some dead code in XendConfig.
Signed-off-by: John Levon <john.levon@sun.com>
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
@@ -1117,10 +1117,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@lists.xensource.com
http://lists.xensource.com/xen-devel