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>

diff --git a/stubdom/README b/stubdom/README
index 87edd52f788e4fd1195c84a1b4840d41ad8ab9b3..a70e31a2b4588ecda820321c613a84e8d5a4a3c2 100644 (file)
--- a/stubdom/README
+++ b/stubdom/README
@@ -11,6 +11,9 @@ 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
+
 In your HVM config "hvmconfig",
 
 - use /usr/lib/xen/bin/stubdom-dm as dm script:

diff --git a/stubdom/stubdom-dm b/stubdom/stubdom-dm
index 49df178fcba682267f0d3622632a557a7b949192..a800bc47465a5b84025b960e8c05463432f0d2e1 100644 (file)
--- a/stubdom/stubdom-dm
+++ b/stubdom/stubdom-dm
@@ -55,7 +55,7 @@ term() {
     kill %1
     (
        [ -n "$vncpid" ] && kill -9 $vncpid
-       xm destroy stubdom-$domname
+       xm destroy $domname-dm
        #xm destroy $domname
     ) &
     # We need to exit immediately so as to let xend do the commands above
@@ -67,12 +67,12 @@ trap term SIGHUP
 ############
 # stubdomain
 # Wait for any previous stubdom to terminate
-while xm list | grep stubdom-$domname
+while xm list | grep $domname-dm
 do
        sleep 1
 done
 
-creation="xm create -c stubdom-$domname target=$domid memory=32 extra=\"$extra\""
+creation="xm create -c $domname-dm target=$domid memory=32 extra=\"$extra\""
 
 (while true ; do sleep 60 ; done) | /bin/sh -c "$creation" &
 #xterm -geometry +0+0 -e /bin/sh -c "$creation ; echo ; echo press ENTER to shut down ; read" &

diff --git a/tools/examples/stubdom-ExampleHVMDomain b/tools/examples/stubdom-ExampleHVMDomain
deleted file mode 100644 (file)
index de1619b..0000000
--- a/tools/examples/stubdom-ExampleHVMDomain
+++ /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 = [ 'type=sdl' ]

diff --git a/tools/examples/xmexample.hvm-dm b/tools/examples/xmexample.hvm-dm
new file mode 100644 (file)
index 0000000..de1619b
--- /dev/null
+++ b/tools/examples/xmexample.hvm-dm
@@ -0,0 +1,14 @@
+# 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 = [ 'type=sdl' ]

diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom
index 117273c5e5fc26208cf3dbebc99e5d612f391102..2c06f7ae2314454cfd407c9be4dffec7109a31ba 100644 (file)
--- a/tools/examples/xmexample.hvm-stubdom
+++ b/tools/examples/xmexample.hvm-stubdom
@@ -30,7 +30,7 @@ memory = 128
 # shadow_memory = 8
 
 # A name for your domain. All domains must have different names.
-name = "ExampleHVMDomain"
+name = "xmexample.hvm"
 
 # 128-bit UUID for the domain.  The default behavior is to generate a new UUID
 # on each call to 'xm create'.