Add vfb config examples.

From: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1
index 741e330bfb1cdee27e7c59d11c98fd7e991f6be4..fc17ca84d9c4fd41ebe4e501709ff4606db5fad3 100644 (file)
--- a/tools/examples/xmexample1
+++ b/tools/examples/xmexample1
@@ -65,6 +65,40 @@ vif = [ '' ]
 
 disk = [ 'phy:hda1,hda1,w' ]
 
+#----------------------------------------------------------------------------
+# Define frame buffer device.
+#
+# By default, no frame buffer device is configured.
+#
+# To create one using the SDL backend and sensible defaults:
+#
+# vfb = [ 'type=sdl' ]
+#
+# This uses environment variables XAUTHORITY and DISPLAY.  You
+# can override that:
+#
+# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
+#
+# To create one using the VNC backend and sensible defaults:
+#
+# vfb = [ 'type=vnc' ]
+#
+# The backend listens on 127.0.0.1 port 5900+N by default, where N is
+# the domain ID.  You can override both address and N:
+#
+# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=1' ]
+#
+# Or you can bind the first unused port above 5900:
+#
+# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
+#
+# You can override the password:
+#
+# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
+#
+# Empty password disables authentication.  Defaults to the vncpasswd
+# configured in xend-config.sxp.
+
 #----------------------------------------------------------------------------
 # Define to which TPM instance the user domain should communicate.
 # The vtpm entry is of the form 'instance=INSTANCE,backend=DOM'

diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2
index 3d4f67701f3bcf72a8f35503662dbd84101e4b99..4d9595c05c8f273e07ab75060266859f397d534d 100644 (file)
--- a/tools/examples/xmexample2
+++ b/tools/examples/xmexample2
@@ -101,6 +101,40 @@ vif = [ '' ]
 disk = [ 'phy:sda%d,sda1,w' % (7+vmid),
          'phy:sda6,sda6,r' ]
 
+#----------------------------------------------------------------------------
+# Define frame buffer device.
+#
+# By default, no frame buffer device is configured.
+#
+# To create one using the SDL backend and sensible defaults:
+#
+# vfb = [ 'type=sdl' ]
+#
+# This uses environment variables XAUTHORITY and DISPLAY.  You
+# can override that:
+#
+# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
+#
+# To create one using the VNC backend and sensible defaults:
+#
+# vfb = [ 'type=vnc' ]
+#
+# The backend listens on 127.0.0.1 port 5900+N by default, where N is
+# the domain ID.  You can override both address and N:
+#
+# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=%d' % vmid ]
+#
+# Or you can bind the first unused port above 5900:
+#
+# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
+#
+# You can override the password:
+#
+# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
+#
+# Empty password disables authentication.  Defaults to the vncpasswd
+# configured in xend-config.sxp.
+
 #----------------------------------------------------------------------------
 # Define to which TPM instance the user domain should communicate.
 # The vtpm entry is of the form 'instance=INSTANCE,backend=DOM'

diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3
index 8c66b4038e21defad058e60ffdf8f33bfe00324f..dd442d642b4e8ae4c79d60c1c611876767962427 100644 (file)
--- a/tools/examples/xmexample3
+++ b/tools/examples/xmexample3
@@ -86,6 +86,40 @@ vif = [ 'ip=192.168.%d.1/24' % (vmid)]
 # All domains get sda6 read-only (to use for /usr, see below).
 disk = [ 'phy:hda%d,hda1,w' % (vmid)]
 
+#----------------------------------------------------------------------------
+# Define frame buffer device.
+#
+# By default, no frame buffer device is configured.
+#
+# To create one using the SDL backend and sensible defaults:
+#
+# vfb = [ 'type=sdl' ]
+#
+# This uses environment variables XAUTHORITY and DISPLAY.  You
+# can override that:
+#
+# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
+#
+# To create one using the VNC backend and sensible defaults:
+#
+# vfb = [ 'type=vnc' ]
+#
+# The backend listens on 127.0.0.1 port 5900+N by default, where N is
+# the domain ID.  You can override both address and N:
+#
+# vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=%d' % vmid ]
+#
+# Or you can bind the first unused port above 5900:
+#
+# vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
+#
+# You can override the password:
+#
+# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
+#
+# Empty password disables authentication.  Defaults to the vncpasswd
+# configured in xend-config.sxp.
+
 #----------------------------------------------------------------------------
 # Define to which TPM instance the user domain should communicate.
 # The vtpm entry is of the form 'instance=INSTANCE,backend=DOM'

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 094b583d57532133801cf995663a556967cbc6dd..e0fe8578859c8455cf366ac4fdb172220513b49c 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -292,7 +292,8 @@ gopts.var('vfb', val="type={vnc,sdl},vncunused=1,vncdisplay=N,vnclisten=ADDR,dis
           For type=vnc, connect an external vncviewer.  The server will listen
           on ADDR (default 127.0.0.1) on port N+5900.  N defaults to the
           domain id.  If vncunused=1, the server will try to find an arbitrary
-          unused port above 5900.
+          unused port above 5900.  vncpasswd overrides the XenD configured
+          default password.
           For type=sdl, a viewer will be started automatically using the
           given DISPLAY and XAUTHORITY, which default to the current user's
           ones.""")