1.1 --- a/tools/examples/xmexample1	Fri Jan 12 14:42:07 2007 +0000
     1.2 +++ b/tools/examples/xmexample1	Fri Jan 12 14:43:50 2007 +0000
     1.3 @@ -66,6 +66,40 @@ vif = [ '' ]
     1.4  disk = [ 'phy:hda1,hda1,w' ]
     1.5  
     1.6  #----------------------------------------------------------------------------
     1.7 +# Define frame buffer device.
     1.8 +#
     1.9 +# By default, no frame buffer device is configured.
    1.10 +#
    1.11 +# To create one using the SDL backend and sensible defaults:
    1.12 +#
    1.13 +# vfb = [ 'type=sdl' ]
    1.14 +#
    1.15 +# This uses environment variables XAUTHORITY and DISPLAY.  You
    1.16 +# can override that:
    1.17 +#
    1.18 +# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
    1.19 +#
    1.20 +# To create one using the VNC backend and sensible defaults:
    1.21 +#
    1.22 +# vfb = [ 'type=vnc' ]
    1.23 +#
    1.24 +# The backend listens on 127.0.0.1 port 5900+N by default, where N is
    1.25 +# the domain ID.  You can override both address and N:
    1.26 +#
    1.27 +# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=1' ]
    1.28 +#
    1.29 +# Or you can bind the first unused port above 5900:
    1.30 +#
    1.31 +# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
    1.32 +#
    1.33 +# You can override the password:
    1.34 +#
    1.35 +# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
    1.36 +#
    1.37 +# Empty password disables authentication.  Defaults to the vncpasswd
    1.38 +# configured in xend-config.sxp.
    1.39 +
    1.40 +#----------------------------------------------------------------------------
    1.41  # Define to which TPM instance the user domain should communicate.
    1.42  # The vtpm entry is of the form 'instance=INSTANCE,backend=DOM'
    1.43  # where INSTANCE indicates the instance number of the TPM the VM

     2.1 --- a/tools/examples/xmexample2	Fri Jan 12 14:42:07 2007 +0000
     2.2 +++ b/tools/examples/xmexample2	Fri Jan 12 14:43:50 2007 +0000
     2.3 @@ -102,6 +102,40 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
     2.4           'phy:sda6,sda6,r' ]
     2.5  
     2.6  #----------------------------------------------------------------------------
     2.7 +# Define frame buffer device.
     2.8 +#
     2.9 +# By default, no frame buffer device is configured.
    2.10 +#
    2.11 +# To create one using the SDL backend and sensible defaults:
    2.12 +#
    2.13 +# vfb = [ 'type=sdl' ]
    2.14 +#
    2.15 +# This uses environment variables XAUTHORITY and DISPLAY.  You
    2.16 +# can override that:
    2.17 +#
    2.18 +# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
    2.19 +#
    2.20 +# To create one using the VNC backend and sensible defaults:
    2.21 +#
    2.22 +# vfb = [ 'type=vnc' ]
    2.23 +#
    2.24 +# The backend listens on 127.0.0.1 port 5900+N by default, where N is
    2.25 +# the domain ID.  You can override both address and N:
    2.26 +#
    2.27 +# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=%d' % vmid ]
    2.28 +#
    2.29 +# Or you can bind the first unused port above 5900:
    2.30 +#
    2.31 +# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
    2.32 +#
    2.33 +# You can override the password:
    2.34 +#
    2.35 +# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
    2.36 +#
    2.37 +# Empty password disables authentication.  Defaults to the vncpasswd
    2.38 +# configured in xend-config.sxp.
    2.39 +
    2.40 +#----------------------------------------------------------------------------
    2.41  # Define to which TPM instance the user domain should communicate.
    2.42  # The vtpm entry is of the form 'instance=INSTANCE,backend=DOM'
    2.43  # where INSTANCE indicates the instance number of the TPM the VM

     3.1 --- a/tools/examples/xmexample3	Fri Jan 12 14:42:07 2007 +0000
     3.2 +++ b/tools/examples/xmexample3	Fri Jan 12 14:43:50 2007 +0000
     3.3 @@ -87,6 +87,40 @@ vif = [ 'ip=192.168.%d.1/24' % (vmid)]
     3.4  disk = [ 'phy:hda%d,hda1,w' % (vmid)]
     3.5  
     3.6  #----------------------------------------------------------------------------
     3.7 +# Define frame buffer device.
     3.8 +#
     3.9 +# By default, no frame buffer device is configured.
    3.10 +#
    3.11 +# To create one using the SDL backend and sensible defaults:
    3.12 +#
    3.13 +# vfb = [ 'type=sdl' ]
    3.14 +#
    3.15 +# This uses environment variables XAUTHORITY and DISPLAY.  You
    3.16 +# can override that:
    3.17 +#
    3.18 +# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
    3.19 +#
    3.20 +# To create one using the VNC backend and sensible defaults:
    3.21 +#
    3.22 +# vfb = [ 'type=vnc' ]
    3.23 +#
    3.24 +# The backend listens on 127.0.0.1 port 5900+N by default, where N is
    3.25 +# the domain ID.  You can override both address and N:
    3.26 +#
    3.27 +# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=%d' % vmid ]
    3.28 +#
    3.29 +# Or you can bind the first unused port above 5900:
    3.30 +#
    3.31 +# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
    3.32 +#
    3.33 +# You can override the password:
    3.34 +#
    3.35 +# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
    3.36 +#
    3.37 +# Empty password disables authentication.  Defaults to the vncpasswd
    3.38 +# configured in xend-config.sxp.
    3.39 +
    3.40 +#----------------------------------------------------------------------------
    3.41  # Define to which TPM instance the user domain should communicate.
    3.42  # The vtpm entry is of the form 'instance=INSTANCE,backend=DOM'
    3.43  # where INSTANCE indicates the instance number of the TPM the VM

     4.1 --- a/tools/python/xen/xm/create.py	Fri Jan 12 14:42:07 2007 +0000
     4.2 +++ b/tools/python/xen/xm/create.py	Fri Jan 12 14:43:50 2007 +0000
     4.3 @@ -292,7 +292,8 @@ gopts.var('vfb', val="type={vnc,sdl},vnc
     4.4            For type=vnc, connect an external vncviewer.  The server will listen
     4.5            on ADDR (default 127.0.0.1) on port N+5900.  N defaults to the
     4.6            domain id.  If vncunused=1, the server will try to find an arbitrary
     4.7 -          unused port above 5900.
     4.8 +          unused port above 5900.  vncpasswd overrides the XenD configured
     4.9 +          default password.
    4.10            For type=sdl, a viewer will be started automatically using the
    4.11            given DISPLAY and XAUTHORITY, which default to the current user's
    4.12            ones.""")