From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Horman <horms@verge.net.au>
Subject: [patch 12/16] xend: pass-through: Use generic code in
	pci_opts_list_to_sxp()
Date: Mon, 15 Jun 2009 11:55:27 +1000
Message-ID: <20090615015913.106513111@vergenet.net>
References: <20090615015515.927085604@vergenet.net>
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline;
	filename=pci_opts_list_to_sxp-dev_dict_to_sxp.patch
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: Masaki Kanno <kanno.masaki@jp.fujitsu.com>, Dexuan Cui <dexuan.cui@intel.com>
List-Id: xen-devel@lists.xenproject.org

Use dev_dict_to_sxp() inside pci_opts_list_to_sxp() now that it is
available.

Cc: Dexuan Cui <dexuan.cui@intel.com>
Cc: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
Signed-off-by: Simon Horman <horms@verge.net.au>

Index: xen-unstable.hg/tools/python/xen/util/pci.py
===================================================================
--- xen-unstable.hg.orig/tools/python/xen/util/pci.py	2009-06-15 11:24:37.000000000 +1000
+++ xen-unstable.hg/tools/python/xen/util/pci.py	2009-06-15 11:24:37.000000000 +1000
@@ -135,12 +135,11 @@ def split_pci_opts(opts):
                filter(lambda x: x != '', opts.split(',')))
 
 def pci_opts_list_to_sxp(list):
-    return ['dev'] + map(lambda x: ['opts', x], list)
+    return dev_dict_to_sxp({'opts': list})
 
 def pci_opts_list_from_sxp(dev):
     return map(lambda x: sxp.children(x)[0], sxp.children(dev, 'opts'))
 
-# This includes a generic equivalent of pci_opts_list_to_sxp()
 def dev_dict_to_sxp(dev):
     def f((key, val)):
         if isinstance(val, types.ListType):

--