ia64/xen-unstable

changeset 18252:035b4ee95328

stubdom: rename the ioemu-dm domain config file to domainname-dm,
which is shorter, makes more sense, and sorts better.

From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Aug 04 16:47:52 2008 +0100 (2008-08-04)
parents f9419c57b360
children 2f29a049b812
files stubdom/README stubdom/stubdom-dm tools/examples/stubdom-ExampleHVMDomain tools/examples/xmexample.hvm-dm tools/examples/xmexample.hvm-stubdom
line diff
     1.1 --- a/stubdom/README	Mon Aug 04 16:45:11 2008 +0100
     1.2 +++ b/stubdom/README	Mon Aug 04 16:47:52 2008 +0100
     1.3 @@ -11,6 +11,9 @@ 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 +
    1.10  In your HVM config "hvmconfig",
    1.11  
    1.12  - use /usr/lib/xen/bin/stubdom-dm as dm script:
     2.1 --- a/stubdom/stubdom-dm	Mon Aug 04 16:45:11 2008 +0100
     2.2 +++ b/stubdom/stubdom-dm	Mon Aug 04 16:47:52 2008 +0100
     2.3 @@ -55,7 +55,7 @@ term() {
     2.4      kill %1
     2.5      (
     2.6  	[ -n "$vncpid" ] && kill -9 $vncpid
     2.7 -	xm destroy stubdom-$domname
     2.8 +	xm destroy $domname-dm
     2.9  	#xm destroy $domname
    2.10      ) &
    2.11      # We need to exit immediately so as to let xend do the commands above
    2.12 @@ -67,12 +67,12 @@ trap term SIGHUP
    2.13  ############
    2.14  # stubdomain
    2.15  # Wait for any previous stubdom to terminate
    2.16 -while xm list | grep stubdom-$domname
    2.17 +while xm list | grep $domname-dm
    2.18  do
    2.19  	sleep 1
    2.20  done
    2.21  
    2.22 -creation="xm create -c stubdom-$domname target=$domid memory=32 extra=\"$extra\""
    2.23 +creation="xm create -c $domname-dm target=$domid memory=32 extra=\"$extra\""
    2.24  
    2.25  (while true ; do sleep 60 ; done) | /bin/sh -c "$creation" &
    2.26  #xterm -geometry +0+0 -e /bin/sh -c "$creation ; echo ; echo press ENTER to shut down ; read" &
     3.1 --- a/tools/examples/stubdom-ExampleHVMDomain	Mon Aug 04 16:45:11 2008 +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 = [ 'type=sdl' ]
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/tools/examples/xmexample.hvm-dm	Mon Aug 04 16:47:52 2008 +0100
     4.3 @@ -0,0 +1,14 @@
     4.4 +# Not to be started directly,
     4.5 +# See xmexample.hvm-stubdom and stubdom/README for more details
     4.6 +
     4.7 +kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
     4.8 +
     4.9 +# Must be the same as in xmexample.hvm-stubdom, with a prepended vif for TCP/IP
    4.10 +# networking in the stubdomain itself, here just ''
    4.11 +vif = [ '', 'type=ioemu, bridge=xenbr0' ]
    4.12 +
    4.13 +# Set here instead of in xmexample.hvm-stubdom
    4.14 +disk = [ 'file:/var/images/min-el3-i386.img,hda,w', ',hdc:cdrom,r' ]
    4.15 +
    4.16 +# Actual output via PVFB
    4.17 +vfb = [ 'type=sdl' ]
     5.1 --- a/tools/examples/xmexample.hvm-stubdom	Mon Aug 04 16:45:11 2008 +0100
     5.2 +++ b/tools/examples/xmexample.hvm-stubdom	Mon Aug 04 16:47:52 2008 +0100
     5.3 @@ -30,7 +30,7 @@ memory = 128
     5.4  # shadow_memory = 8
     5.5  
     5.6  # A name for your domain. All domains must have different names.
     5.7 -name = "ExampleHVMDomain"
     5.8 +name = "xmexample.hvm"
     5.9  
    5.10  # 128-bit UUID for the domain.  The default behavior is to generate a new UUID
    5.11  # on each call to 'xm create'.