tools: remove references to xend-config.sxp

xend is gone. Remove references to its config file.
Also remove python script sxp-pretty which relies on removed code.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/examples/README b/tools/examples/README
index 5916df3d79217e935cce89524fd0ca90ca4c86b7..115ca02f17fda94b0435bf12230e507f54573d00 100644 (file)
--- a/tools/examples/README
+++ b/tools/examples/README
@@ -25,7 +25,6 @@ vif-route           - xen virtual network start/stop script in routed mode
 xen-backend.agent   - calls block, vif-* scripts to add, remove, hotplug
                       devices  
 xen-backend.rules   - hotplug script rules
-xend-config.sxp     - default xend configuration file
 xen-hotplug-common.sh - sourced by vif-common.sh
 xen-network-common.sh - sourced by vif-common.sh
 xen-script-common.sh  - sourced by xen-hotplug-common.sh

diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge
index df447899d3d38f6c0b6f6ae2bcfa0137a7ee30f7..3d72ca45269d4060a846190c44260b17bc8ec551 100644 (file)
--- a/tools/hotplug/Linux/vif-bridge
+++ b/tools/hotplug/Linux/vif-bridge
@@ -3,10 +3,6 @@
 # ${XEN_SCRIPT_DIR}/vif-bridge
 #
 # Script for configuring a vif in bridged mode.
-# The hotplugging system will call this script if it is specified either in
-# the device configuration given to Xend, or the default Xend configuration
-# in ${XEN_CONFIG_DIR}/xend-config.sxp.  If the script is specified in
-# neither of those places, then this script is the default.
 #
 # Usage:
 # vif-bridge (add|remove|online|offline)

diff --git a/tools/hotplug/Linux/vif-nat b/tools/hotplug/Linux/vif-nat
index 0b900d5d35cddca8c7f1ca458b3bd692c75b67f1..a76d9c784b5fea0fe585082a1960d9c128198c00 100644 (file)
--- a/tools/hotplug/Linux/vif-nat
+++ b/tools/hotplug/Linux/vif-nat
@@ -3,10 +3,6 @@
 # ${XEN_SCRIPT_DIR}/vif-nat
 #
 # Script for configuring a vif in routed-nat mode.
-# The hotplugging system will call this script if it is specified either in
-# the device configuration given to Xend, or the default Xend configuration
-# in ${XEN_CONFIG_DIR}/xend-config.sxp.  If the script is specified in
-# neither of those places, then vif-bridge is the default.
 #
 # Usage:
 # vif-nat (add|remove|online|offline)

diff --git a/tools/hotplug/Linux/vif-openvswitch b/tools/hotplug/Linux/vif-openvswitch
index a8e4fc7d253fdd164d8999149f10ed47dc8e8fd6..18bfb6cefbe8bdae27b610e101e6fb8aba96a560 100644 (file)
--- a/tools/hotplug/Linux/vif-openvswitch
+++ b/tools/hotplug/Linux/vif-openvswitch
@@ -3,10 +3,6 @@
 # ${XEN_SCRIPT_DIR}/vif-openvswitch
 #
 # Script for configuring a vif in openvswitch mode.
-# The hotplugging system will call this script if it is specified either in
-# the device configuration given to Xend, or the default Xend configuration
-# in ${XEN_CONFIG_DIR}/xend-config.sxp.  If the script is specified in
-# neither of those places, then this script is the default.
 #
 # Usage:
 # vif-openvswitch (add|remove|online|offline)

diff --git a/tools/hotplug/Linux/vif-route b/tools/hotplug/Linux/vif-route
index 02f1403a54941f6923febc2f74a83f2d3f71f61c..c149ffca73a8a6421915865698a6c49f1a07791c 100644 (file)
--- a/tools/hotplug/Linux/vif-route
+++ b/tools/hotplug/Linux/vif-route
@@ -3,10 +3,6 @@
 # ${XEN_SCRIPT_DIR}/vif-route
 #
 # Script for configuring a vif in routed mode.
-# The hotplugging system will call this script if it is specified either in
-# the device configuration given to Xend, or the default Xend configuration
-# in ${XEN_CONFIG_DIR}/xend-config.sxp.  If the script is specified in
-# neither of those places, then vif-bridge is the default.
 #
 # Usage:
 # vif-route (add|remove|online|offline)

diff --git a/tools/misc/sxp-pretty b/tools/misc/sxp-pretty
deleted file mode 100644 (file)
index dd642b0..0000000
--- a/tools/misc/sxp-pretty
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-#  -*- mode: python; -*-
-#============================================================================
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of version 2.1 of the GNU Lesser General Public
-# License as published by the Free Software Foundation.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#============================================================================
-# Copyright (c) 2007 XenSource Inc.
-#============================================================================
-
-
-import commands
-import os.path
-import pprint
-import sys
-
-import xen.xend.sxp as sxp
-
-def main():
-    if len(sys.argv) == 1 or sys.argv[1] in ['', '-']:
-        s = sxp.parse(sys.stdin)
-    else:
-        s = sxp.parse(open(sys.argv[1]))
-
-    pprint.pprint(s)
-
-if __name__ == '__main__':
-    sys.exit(main())