direct-io.hg

changeset 7457:cefe36be8592

Tidy xend-config.sxp, removing entries that haven't been used since the
hotplugging stuff was introduced (block-*, console-port-base, console-address)
and introducing entries for options that have been present for ages
(xend-{http,unix,relocation}-server, xend-unix-path, xend-relocation-address,
enable-dump). Remove vif-antispoof, as Vifctl no longer passes this option
down.

Made the xend-relocation-server default to no, as this is a potential security
hole and so must be turned on explicitly.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@leeni.uk.xensource.com
date Fri Oct 21 12:04:30 2005 +0100 (2005-10-21)
parents 4d49f61a7fee
children 19af31a59537
files tools/examples/xend-config.sxp tools/python/xen/xend/XendRoot.py
line diff
     1.1 --- a/tools/examples/xend-config.sxp	Fri Oct 21 11:22:48 2005 +0100
     1.2 +++ b/tools/examples/xend-config.sxp	Fri Oct 21 12:04:30 2005 +0100
     1.3 @@ -1,27 +1,52 @@
     1.4 +# -*- sh -*-
     1.5 +
     1.6 +#
     1.7  # Xend configuration file.
     1.8 +#
     1.9  
    1.10 -# Port xend should use for the HTTP interface.
    1.11 -(xend-port         8000)
    1.12 +# This example configuration is appropriate for an installation that trusts
    1.13 +# only localhost connections, and is otherwise fully functional, with a
    1.14 +# bridged network configuration.
    1.15 +
    1.16 +# Commented out entries show the default for that entry, unless otherwise
    1.17 +# specified.
    1.18 +
    1.19 +#(logfile /var/log/xend.log)
    1.20 +#(loglevel DEBUG)
    1.21  
    1.22 -# Port xend should use for the event interface.
    1.23 -(xend-event-port   8001)
    1.24 +#(xend-http-server no)
    1.25 +(xend-http-server yes)
    1.26 +#(xend-unix-server yes)
    1.27 +#(xend-relocation-server no)
    1.28 +(xend-relocation-server yes)
    1.29 +
    1.30 +#(xend-unix-path /var/lib/xend/xend-socket)
    1.31  
    1.32 -# Address xend should listen on for HTTP connections.
    1.33 +# Port xend should use for the HTTP interface, if xend-http-server is set.
    1.34 +#(xend-port            8000)
    1.35 +
    1.36 +# Port xend should use for the event interface.  This interface is deprecated.
    1.37 +#(xend-event-port      8001)
    1.38 +
    1.39 +# Port xend should use for the relocation interface, if xend-relocation-server
    1.40 +# is set.
    1.41 +#(xend-relocation-port 8002)
    1.42 +
    1.43 +# Address xend should listen on for HTTP connections, if xend-http-server is
    1.44 +# set.
    1.45  # Specifying 'localhost' prevents remote connections.
    1.46 -# Specifying the empty string '' allows all connections.
    1.47 -(xend-address      'localhost')
    1.48 +# Specifying the empty string '' (the default) allows all connections.
    1.49 +#(xend-address '')
    1.50 +(xend-address localhost)
    1.51  
    1.52 -# The port xend should start from when allocating a port
    1.53 -# for a domain console.
    1.54 -(console-port-base 9600)
    1.55 -
    1.56 -# Address xend should listen on for console connections.
    1.57 -# Specifying 'localhost' prevents remote connections.
    1.58 -# Specifying the empty string '' allows all connections.
    1.59 -(console-address   'localhost')
    1.60 +# Address xend should listen on for relocation-socket connections, if
    1.61 +# xend-relocation-server is set.
    1.62 +# Meaning and default as for xend-address above.
    1.63 +#(xend-relocation-address '')
    1.64 +(xend-relocation-address localhost)
    1.65  
    1.66  # The limit (in kilobytes) on the size of the console buffer
    1.67 -(console-limit 1024)
    1.68 +#(console-limit 1024)
    1.69  
    1.70  ## Use the following if VIF traffic is routed.
    1.71  # The script used to start/stop networking for xend.
    1.72 @@ -37,16 +62,6 @@
    1.73  # The default script used to control virtual interfaces.
    1.74  (vif-script        vif-bridge)
    1.75  
    1.76 -# Whether iptables should be set up to prevent IP spoofing for
    1.77 -# virtual interfaces. Specify 'yes' or 'no'.
    1.78 -(vif-antispoof     no)
    1.79 -
    1.80 -# Setup script for file-backed block devices
    1.81 -(block-file block-file)
    1.82 -
    1.83 -# Setup script for enbd-backed block devices
    1.84 -(block-enbd block-enbd)
    1.85 -
    1.86  # Dom0 will balloon out when needed to free memory for domU.
    1.87  # dom0-min-mem is the lowest memory level (in MB) dom0 will get down to.
    1.88  # If dom0-min-mem=0, dom0 will never balloon out.
    1.89 @@ -55,3 +70,6 @@
    1.90  # In SMP system, dom0 will use dom0-cpus # of CPUS
    1.91  # If dom0-cpus = 0, dom0 will take all cpus available
    1.92  (dom0-cpus 0)
    1.93 +
    1.94 +# Whether to enable core-dumps when domains crash.
    1.95 +#(enable-dump no)
     2.1 --- a/tools/python/xen/xend/XendRoot.py	Fri Oct 21 11:22:48 2005 +0100
     2.2 +++ b/tools/python/xen/xend/XendRoot.py	Fri Oct 21 12:04:30 2005 +0100
     2.3 @@ -64,7 +64,7 @@ class XendRoot:
     2.4      xend_address_default      = ''
     2.5  
     2.6      """Default for the flag indicating whether xend should run a relocation server."""
     2.7 -    xend_relocation_server_default = 'yes'
     2.8 +    xend_relocation_server_default = 'no'
     2.9  
    2.10      """Default interface address the xend relocation server listens at. """
    2.11      xend_relocation_address_default = ''