aboutsummaryrefslogtreecommitdiffstats
path: root/tools/examples/xmexample.pv-grub
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-03-06 19:13:23 +0000
committerKeir Fraser <keir.fraser@citrix.com>2009-03-06 19:13:23 +0000
commit3ba7d233c7cf9bcd152314be5992ea3ddf2bc37a (patch)
treec613d9da58a6e46d59122d5bd50f735dedd3c556 /tools/examples/xmexample.pv-grub
parent31e93ebbdd541a9b9bbb08089b663c1201a069d9 (diff)
downloadxen-3ba7d233c7cf9bcd152314be5992ea3ddf2bc37a.tar.gz
xen-3ba7d233c7cf9bcd152314be5992ea3ddf2bc37a.tar.bz2
xen-3ba7d233c7cf9bcd152314be5992ea3ddf2bc37a.zip
xend: allow VM configuration with both sdl=1 and vnc=1
In the stubdom case you can now specify sdl=1 and vnc=1 (again, both can be selected at the same time) in the vfb configuration. So instead of: vfb = [ 'type=vnc' ] now you have: vfb = [ 'vnc=1,sdl=1' ] the former configuration option is deprecated but still supported for backward compatibility. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'tools/examples/xmexample.pv-grub')
-rw-r--r--tools/examples/xmexample.pv-grub12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/examples/xmexample.pv-grub b/tools/examples/xmexample.pv-grub
index 2d647c9365..1b687151b6 100644
--- a/tools/examples/xmexample.pv-grub
+++ b/tools/examples/xmexample.pv-grub
@@ -77,29 +77,29 @@ disk = [ 'phy:hda1,hda1,w' ]
#
# To create one using the SDL backend and sensible defaults:
#
-# vfb = [ 'type=sdl' ]
+# vfb = [ 'sdl=1' ]
#
# This uses environment variables XAUTHORITY and DISPLAY. You
# can override that:
#
-# vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
+# vfb = [ 'sdl=1,xauthority=/home/bozo/.Xauthority,display=:1' ]
#
# To create one using the VNC backend and sensible defaults:
#
-# vfb = [ 'type=vnc' ]
+# vfb = [ 'vnc=1' ]
#
# 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' ]
+# vfb = [ 'vnc=1,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,vncunused=1' ]
+# vfb = [ 'vnc=1,vnclisten=0.0.0.0,vncunused=1' ]
#
# You can override the password:
#
-# vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
+# vfb = [ 'vnc=1,vncpasswd=MYPASSWD' ]
#
# Empty password disables authentication. Defaults to the vncpasswd
# configured in xend-config.sxp.