From 3ba7d233c7cf9bcd152314be5992ea3ddf2bc37a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 6 Mar 2009 19:13:23 +0000 Subject: 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 --- tools/examples/xmexample.hvm-dm | 2 +- tools/examples/xmexample.pv-grub | 12 ++++++------ tools/examples/xmexample1 | 12 ++++++------ tools/examples/xmexample2 | 12 ++++++------ tools/examples/xmexample3 | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tools/examples') diff --git a/tools/examples/xmexample.hvm-dm b/tools/examples/xmexample.hvm-dm index de1619ba32..9e7d207b98 100644 --- a/tools/examples/xmexample.hvm-dm +++ b/tools/examples/xmexample.hvm-dm @@ -11,4 +11,4 @@ vif = [ '', 'type=ioemu, bridge=xenbr0' ] disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ] # Actual output via PVFB -vfb = [ 'type=sdl' ] +vfb = [ 'sdl=1' ] 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. diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1 index fe382d43f6..330aaf0999 100644 --- a/tools/examples/xmexample1 +++ b/tools/examples/xmexample1 @@ -73,29 +73,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. diff --git a/tools/examples/xmexample2 b/tools/examples/xmexample2 index 53ee3aa98e..4e5eb3dffb 100644 --- a/tools/examples/xmexample2 +++ b/tools/examples/xmexample2 @@ -109,29 +109,29 @@ disk = [ 'phy:sda%d,sda1,w' % (7+vmid), # # 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=%d' % vmid ] +# vfb = [ 'vnc=1,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,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. diff --git a/tools/examples/xmexample3 b/tools/examples/xmexample3 index 99281904fd..dc22ce1db3 100644 --- a/tools/examples/xmexample3 +++ b/tools/examples/xmexample3 @@ -94,29 +94,29 @@ disk = [ 'phy:hda%d,hda1,w' % (vmid)] # # 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=%d' % vmid ] +# vfb = [ 'vnc=1,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,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. -- cgit v1.2.3