aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-08-04 16:47:52 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-08-04 16:47:52 +0100
commit23566e775d1e90064a01107d5e6c75a00ab6a2fe (patch)
tree59d730ee4c37c622e5283938ad1d3d05d014db9f
parent7a65b19d09e2b591c9c9bb8ccf3b83767c586660 (diff)
downloadxen-23566e775d1e90064a01107d5e6c75a00ab6a2fe.tar.gz
xen-23566e775d1e90064a01107d5e6c75a00ab6a2fe.tar.bz2
xen-23566e775d1e90064a01107d5e6c75a00ab6a2fe.zip
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>
-rw-r--r--stubdom/README3
-rw-r--r--stubdom/stubdom-dm6
-rw-r--r--tools/examples/xmexample.hvm-dm (renamed from tools/examples/stubdom-ExampleHVMDomain)0
-rw-r--r--tools/examples/xmexample.hvm-stubdom2
4 files changed, 7 insertions, 4 deletions
diff --git a/stubdom/README b/stubdom/README
index 87edd52f78..a70e31a2b4 100644
--- 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 49df178fcb..a800bc4746 100644
--- 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/xmexample.hvm-dm
index de1619ba32..de1619ba32 100644
--- a/tools/examples/stubdom-ExampleHVMDomain
+++ b/tools/examples/xmexample.hvm-dm
diff --git a/tools/examples/xmexample.hvm-stubdom b/tools/examples/xmexample.hvm-stubdom
index 117273c5e5..2c06f7ae23 100644
--- 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'.