1.1 --- a/stubdom/README	Fri May 08 11:50:12 2009 +0100
     1.2 +++ b/stubdom/README	Mon May 11 13:50:34 2009 +0100
     1.3 @@ -11,68 +11,12 @@ of video memory for the HVM domain, you 
     1.4  by using the hypervisor dom0_mem= option for instance.
     1.5  
     1.6  
     1.7 -There is a sample configuration set in xmexample.hvm-stubdom and
     1.8 -xmexample.hvm-dm
     1.9 +There is a sample configuration set in xmexample.hvm-stubdom
    1.10  
    1.11 -In your HVM config "hvmconfig",
    1.12 -
    1.13 -- use /usr/lib/xen/bin/stubdom-dm as dm script:
    1.14 +In your HVM config "hvmconfig" use /usr/lib/xen/bin/stubdom-dm as dm script:
    1.15  
    1.16  device_model = '/usr/lib/xen/bin/stubdom-dm'
    1.17  
    1.18 -- comment the disk statement:
    1.19 -
    1.20 -#disk = [  'file:/tmp/install.iso,hdc:cdrom,r', 'phy:/dev/sda6,hda,w', 'file:/tmp/test,hdb,r' ]
    1.21 -
    1.22 -- disable anything related to dom0, like pty serial assignments
    1.23 -
    1.24 -
    1.25 -Create /etc/xen/hvmconfig-dm (where "hvmconfig" is the name of your HVM
    1.26 -guest) with
    1.27 -
    1.28 -kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
    1.29 -vif = ['ip=10.0.1.1,mac=aa:00:00:12:23:34']
    1.30 -disk = [  'file:/tmp/install.iso,hdc:cdrom,r', 'phy:/dev/sda6,hda,w', 'file:/tmp/test,hdb,r' ]
    1.31 -
    1.32 -where
    1.33 -- 'ip=10.0.1.1,mac= etc...' is the same net configuration as in the hvmconfig
    1.34 -script,
    1.35 -- and disk = is the same block configuration as in the hvmconfig script.
    1.36 -
    1.37 -Display Configuration
    1.38 -=====================
    1.39 -
    1.40 -There are two possibilities
    1.41 -
    1.42 -* Using SDL
    1.43 -
    1.44 -  - In hvmconfig, disable vnc and sdl:
    1.45 -
    1.46 -vnc = 0
    1.47 -sdl = 0
    1.48 -
    1.49 -  - In hvmconfig-dm, set an sdl vfb:
    1.50 -
    1.51 -vfb = [ 'type=sdl' ]
    1.52 -
    1.53 -    by default qemu will use sdl together with opengl for rendering, if
    1.54 -    you do not want qemu to use opengl then also pass opengl=0:
    1.55 -
    1.56 -vfb = [ 'type=sdl, opengl=0' ]
    1.57 -
    1.58 -
    1.59 -* Using a VNC server in dom0
    1.60 -
    1.61 -  - In hvmconfig, disable vnc and sdl:
    1.62 -
    1.63 -vnc = 0
    1.64 -sdl = 0
    1.65 -
    1.66 -  - In hvmconfig-dm, set a vnc vfb:
    1.67 -
    1.68 -vfb = [ 'type=vnc' ]
    1.69 -
    1.70 -and any other parameter as wished.
    1.71  
    1.72  To run
    1.73  ======

     2.1 --- a/tools/examples/Makefile	Fri May 08 11:50:12 2009 +0100
     2.2 +++ b/tools/examples/Makefile	Mon May 11 13:50:34 2009 +0100
     2.3 @@ -17,7 +17,6 @@ XEN_CONFIGS += xmexample2
     2.4  XEN_CONFIGS += xmexample3
     2.5  XEN_CONFIGS += xmexample.hvm
     2.6  XEN_CONFIGS += xmexample.hvm-stubdom
     2.7 -XEN_CONFIGS += xmexample.hvm-dm
     2.8  XEN_CONFIGS += xmexample.pv-grub
     2.9  XEN_CONFIGS += xmexample.nbd
    2.10  XEN_CONFIGS += xmexample.vti

     3.1 --- a/tools/examples/xmexample.hvm-dm	Fri May 08 11:50:12 2009 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,14 +0,0 @@
     3.4 -# Not to be started directly,
     3.5 -# See xmexample.hvm-stubdom and stubdom/README for more details
     3.6 -
     3.7 -kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
     3.8 -
     3.9 -# Must be the same as in xmexample.hvm-stubdom, with a prepended vif for TCP/IP
    3.10 -# networking in the stubdomain itself, here just ''
    3.11 -vif = [ '', 'type=ioemu, bridge=xenbr0' ]
    3.12 -
    3.13 -# Set here instead of in xmexample.hvm-stubdom
    3.14 -disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ]
    3.15 -
    3.16 -# Actual output via PVFB
    3.17 -vfb = [ 'sdl=1' ]

     4.1 --- a/tools/examples/xmexample.hvm-stubdom	Fri May 08 11:50:12 2009 +0100
     4.2 +++ b/tools/examples/xmexample.hvm-stubdom	Mon May 11 13:50:34 2009 +0100
     4.3 @@ -6,8 +6,7 @@
     4.4  # you can set the parameters for the domain on the xm command line.
     4.5  #============================================================================
     4.6  #
     4.7 -# This is a version using a stubdomain for device model, see
     4.8 -# xmexample.hvm-dm and README.stubdom for more details
     4.9 +# This is a version using a stubdomain for device model
    4.10  # The differences with xmexample.hvm are marked with "STUBDOM"
    4.11  
    4.12  #----------------------------------------------------------------------------
    4.13 @@ -68,11 +67,8 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
    4.14  # Each disk entry is of the form phy:UNAME,DEV,MODE
    4.15  # where UNAME is the device, DEV is the device name the domain will see,
    4.16  # and MODE is r for read-only, w for read-write.
    4.17 -#
    4.18 -# STUBDOM: do not put it here but in stubdom-ExampleHVMDomain
    4.19  
    4.20 -#disk = [ 'phy:hda1,hda1,r' ]
    4.21 -#disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ]
    4.22 +disk = [ 'file:/var/images/min-el3-i386.img,hda,w', 'phy:/dev/cdrom,hdc:cdrom,r' ]
    4.23  
    4.24  #----------------------------------------------------------------------------
    4.25  # Configure the behaviour when a domain exits.  There are three 'reasons'
    4.26 @@ -127,7 +123,7 @@ device_model = '/usr/lib/xen/bin/stubdom
    4.27  #-----------------------------------------------------------------------------
    4.28  # boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d) 
    4.29  # default: hard disk, cd-rom, floppy
    4.30 -#boot="cda"
    4.31 +boot="cda"
    4.32  
    4.33  #-----------------------------------------------------------------------------
    4.34  #  write to temporary files instead of disk image files
    4.35 @@ -136,19 +132,17 @@ device_model = '/usr/lib/xen/bin/stubdom
    4.36  #----------------------------------------------------------------------------
    4.37  # enable SDL library for graphics, default = 0
    4.38  # 
    4.39 -# STUBDOM: always disable since the stub domain doesn't have direct X access
    4.40  sdl=0
    4.41  
    4.42  #----------------------------------------------------------------------------
    4.43  # enable OpenGL for texture rendering inside the SDL window, default = 1
    4.44  # valid only if sdl is enabled.
    4.45  # 
    4.46 -# STUBDOM: always disable for the same reason
    4.47 -opengl=0
    4.48 +opengl=1
    4.49  
    4.50  #----------------------------------------------------------------------------
    4.51  # enable VNC library for graphics, default = 1
    4.52 -vnc=0
    4.53 +vnc=1
    4.54  
    4.55  #----------------------------------------------------------------------------
    4.56  # address that should be listened on for the VNC server if vnc is set.