Re: [Xen-devel] [PATCH for-xen-4.5] tools: remove references to xend-config.sxp

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

On Mon, Oct 06, 2014 at 03:37:49PM +0200, Olaf Hering wrote:
> 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@xxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> ---
>  tools/examples/README               |  1 -
>  tools/hotplug/Linux/vif-bridge      |  4 ----
>  tools/hotplug/Linux/vif-nat         |  4 ----
>  tools/hotplug/Linux/vif-openvswitch |  4 ----
>  tools/hotplug/Linux/vif-route       |  4 ----
>  tools/misc/sxp-pretty               | 37 
> -------------------------------------
>  6 files changed, 54 deletions(-)

Oh yeah!

Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> 
> diff --git a/tools/examples/README b/tools/examples/README
> index 5916df3..115ca02 100644
> --- 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 df44789..3d72ca4 100644
> --- 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 0b900d5..a76d9c7 100644
> --- 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 a8e4fc7..18bfb6c 100644
> --- 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 02f1403..c149ffc 100644
> --- 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
> 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())

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel