xen-devel

[Top] [All Lists]

[Xen-devel] [PATCH] small XendConfig cleanup

from [John Levon]

[Permanent Link][Original]

To:	xen-devel@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-devel] [PATCH] small XendConfig cleanup
From:	John Levon <levon@xxxxxxxxxxxxxxxxx>
Date:	Fri, 5 Jan 2007 16:20:40 +0000
Delivery-date:	Fri, 05 Jan 2007 08:18:55 -0800
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id:	Xen developer discussion <xen-devel.lists.xensource.com>
List-post:	<mailto:xen-devel@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender:	xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent:	Mutt/1.5.9i

# HG changeset patch
# User john.levon@xxxxxxx
# Date 1168013289 28800
# Node ID 70d8db84401c344fa3e99e2cacb1431555c99ce4
# Parent  476bb3dead3c43a38dc06a1cde6d2ac0bd1ad1e8
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
@@ -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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-devel] [PATCH] small XendConfig cleanup, John Levon <=

Previous by Date:	[Xen-devel] [PATCH] Use SMF for xend configuration, John Levon
Next by Date:	Re: [Xen-devel] SMBIOS problem with PXE booting, Tim Deegan
Previous by Thread:	[Xen-devel] [PATCH] Use SMF for xend configuration, John Levon
Next by Thread:	[Xen-devel] [PATCH 1/7] Fix pygrub path on Solaris, John Levon
Indexes:	[Date] [Thread] [Top] [All Lists]