# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217864872 -3600
# Node ID 035b4ee95328632b03fd41d36baf4c9c01056454
# Parent f9419c57b360c074a10d1a2d0d1daac3e78ee18e
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@xxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
tools/examples/stubdom-ExampleHVMDomain | 14 --------------
stubdom/README | 3 +++
stubdom/stubdom-dm | 6 +++---
tools/examples/xmexample.hvm-dm | 14 ++++++++++++++
tools/examples/xmexample.hvm-stubdom | 2 +-
5 files changed, 21 insertions(+), 18 deletions(-)
diff -r f9419c57b360 -r 035b4ee95328 stubdom/README
--- a/stubdom/README Mon Aug 04 16:45:11 2008 +0100
+++ b/stubdom/README Mon Aug 04 16:47:52 2008 +0100
@@ -10,6 +10,9 @@ of video memory for the HVM domain, you
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",
diff -r f9419c57b360 -r 035b4ee95328 stubdom/stubdom-dm
--- a/stubdom/stubdom-dm Mon Aug 04 16:45:11 2008 +0100
+++ b/stubdom/stubdom-dm Mon Aug 04 16:47:52 2008 +0100
@@ -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 -r f9419c57b360 -r 035b4ee95328 tools/examples/stubdom-ExampleHVMDomain
--- a/tools/examples/stubdom-ExampleHVMDomain Mon Aug 04 16:45:11 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f9419c57b360 -r 035b4ee95328 tools/examples/xmexample.hvm-dm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/examples/xmexample.hvm-dm Mon Aug 04 16:47:52 2008 +0100
@@ -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 -r f9419c57b360 -r 035b4ee95328 tools/examples/xmexample.hvm-stubdom
--- a/tools/examples/xmexample.hvm-stubdom Mon Aug 04 16:45:11 2008 +0100
+++ b/tools/examples/xmexample.hvm-stubdom Mon Aug 04 16:47:52 2008 +0100
@@ -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'.
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home