stubdom docs: Update to reflect the new way of configuring stubdom domains.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

4 files changed, 7 insertions, 84 deletions

diff --git a/stubdom/README b/stubdom/README
index db10f56267..caab1894d1 100644
--- a/stubdom/README
+++ b/stubdom/README
@@ -11,68 +11,12 @@ of video memory for the HVM domain, you need to avoid the need for ballooning,
 by using the hypervisor dom0_mem= option for instance.
 
 
-There is a sample configuration set in xmexample.hvm-stubdom and
-xmexample.hvm-dm
+There is a sample configuration set in xmexample.hvm-stubdom
 
-In your HVM config "hvmconfig",
-
-- use /usr/lib/xen/bin/stubdom-dm as dm script:
+In your HVM config "hvmconfig" use /usr/lib/xen/bin/stubdom-dm as dm script:
 
 device_model = '/usr/lib/xen/bin/stubdom-dm'
 
-- comment the disk statement:
-
-#disk = [  'file:/tmp/install.iso,hdc:cdrom,r', 'phy:/dev/sda6,hda,w', 'file:/tmp/test,hdb,r' ]
-
-- disable anything related to dom0, like pty serial assignments
-
-
-Create /etc/xen/hvmconfig-dm (where "hvmconfig" is the name of your HVM
-guest) with
-
-kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
-vif = ['ip=10.0.1.1,mac=aa:00:00:12:23:34']
-disk = [  'file:/tmp/install.iso,hdc:cdrom,r', 'phy:/dev/sda6,hda,w', 'file:/tmp/test,hdb,r' ]
-
-where
-- 'ip=10.0.1.1,mac= etc...' is the same net configuration as in the hvmconfig
-script,
-- and disk = is the same block configuration as in the hvmconfig script.
-
-Display Configuration
-=====================
-
-There are two possibilities
-
-* Using SDL
-
-  - In hvmconfig, disable vnc and sdl:
-
-vnc = 0
-sdl = 0
-
-  - In hvmconfig-dm, set an sdl vfb:
-
-vfb = [ 'type=sdl' ]
-
-    by default qemu will use sdl together with opengl for rendering, if
-    you do not want qemu to use opengl then also pass opengl=0:
-
-vfb = [ 'type=sdl, opengl=0' ]
-
-
-* Using a VNC server in dom0
-
-  - In hvmconfig, disable vnc and sdl:
-
-vnc = 0
-sdl = 0
-
-  - In hvmconfig-dm, set a vnc vfb:
-
-vfb = [ 'type=vnc' ]
-
-and any other parameter as wished.
 
 To run
 ======
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 6c8349b154..ecddb43e77 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -17,7 +17,6 @@ XEN_CONFIGS += xmexample2
 XEN_CONFIGS += xmexample3
 XEN_CONFIGS += xmexample.hvm
 XEN_CONFIGS += xmexample.hvm-stubdom
-XEN_CONFIGS += xmexample.hvm-dm
 XEN_CONFIGS += xmexample.pv-grub
 XEN_CONFIGS += xmexample.nbd
 XEN_CONFIGS += xmexample.vti
diff --git a/tools/examples/xmexample.hvm-dm b/tools/examples/xmexample.hvm-dm
deleted file mode 100644
index 9e7d207b98..0000000000
--- a/tools/examples/xmexample.hvm-dm
+++ /dev/null
@@ -1,14 +0,0 @@
-# Not to be started directly,
-# See xmexample.hvm-stubdom and stubdom/README for more details
-
-kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
-
-# Must be the same as in xmexample.hvm-stubdom, with a prepended vif for TCP/IP
-# networking in the stubdomain itself, here just ''
-vif = [ '', 'type=ioemu, bridge=xenbr0' ]
-
-# Set here instead of in xmexample.hvm-stubdom
-disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ]
-
-# Actual output via PVFB
-vfb = [ 'sdl=1' ]
diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom
index bfceef30f3..acc250eb22 100644
--- a/tools/examples/xmexample.hvm-stubdom
+++ b/tools/examples/xmexample.hvm-stubdom
@@ -6,8 +6,7 @@
 # you can set the parameters for the domain on the xm command line.
 #============================================================================
 #
-# This is a version using a stubdomain for device model, see
-# xmexample.hvm-dm and README.stubdom for more details
+# This is a version using a stubdomain for device model
 # The differences with xmexample.hvm are marked with "STUBDOM"
 
 #----------------------------------------------------------------------------
@@ -68,11 +67,8 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
 # Each disk entry is of the form phy:UNAME,DEV,MODE
 # where UNAME is the device, DEV is the device name the domain will see,
 # and MODE is r for read-only, w for read-write.
-#
-# STUBDOM: do not put it here but in stubdom-ExampleHVMDomain
 
-#disk = [ 'phy:hda1,hda1,r' ]
-#disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ]
+disk = [ 'file:/var/images/min-el3-i386.img,hda,w', 'phy:/dev/cdrom,hdc:cdrom,r' ]
 
 #----------------------------------------------------------------------------
 # Configure the behaviour when a domain exits.  There are three 'reasons'
@@ -127,7 +123,7 @@ device_model = '/usr/lib/xen/bin/stubdom-dm'
 #-----------------------------------------------------------------------------
 # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
 # default: hard disk, cd-rom, floppy
-#boot="cda"
+boot="cda"
 
 #-----------------------------------------------------------------------------
 #  write to temporary files instead of disk image files
@@ -136,19 +132,17 @@ device_model = '/usr/lib/xen/bin/stubdom-dm'
 #----------------------------------------------------------------------------
 # enable SDL library for graphics, default = 0
 # 
-# STUBDOM: always disable since the stub domain doesn't have direct X access
 sdl=0
 
 #----------------------------------------------------------------------------
 # enable OpenGL for texture rendering inside the SDL window, default = 1
 # valid only if sdl is enabled.
 # 
-# STUBDOM: always disable for the same reason
-opengl=0
+opengl=1
 
 #----------------------------------------------------------------------------
 # enable VNC library for graphics, default = 1
-vnc=0
+vnc=1
 
 #----------------------------------------------------------------------------
 # address that should be listened on for the VNC server if vnc is set.