diff options
| author | Wei Liu <wei.liu2@citrix.com> | 2013-01-11 12:22:28 +0000 |
|---|---|---|
| committer | Wei Liu <wei.liu2@citrix.com> | 2013-01-11 12:22:28 +0000 |
| commit | f80b09c08b2a97dfcd51cc6dc809519f74ab90cc (patch) | |
| tree | 74342d0a111a2dd3653a1c631016900d036cc464 /tools/hotplug | |
| parent | 9c23a1d0eb7a6b5e3273d527cfd7960838fbfee6 (diff) | |
| download | xen-f80b09c08b2a97dfcd51cc6dc809519f74ab90cc.tar.gz xen-f80b09c08b2a97dfcd51cc6dc809519f74ab90cc.tar.bz2 xen-f80b09c08b2a97dfcd51cc6dc809519f74ab90cc.zip | |
xencommons: Stop QEMU in do_stop()
do_stop() is invoked by "restart" action. We can get multiple QEMUs started up
for Dom0 if we don't kill previous ones.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/hotplug')
| -rw-r--r-- | tools/hotplug/Linux/init.d/xencommons | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index cc8177e6ea..cc5e45c5bf 100644 --- a/tools/hotplug/Linux/init.d/xencommons +++ b/tools/hotplug/Linux/init.d/xencommons @@ -27,6 +27,7 @@ fi test -f $xencommons_config/xencommons && . $xencommons_config/xencommons XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid +QEMU_PIDFILE=/var/run/qemu-dom0.pid shopt -s extglob # not running in Xen dom0 or domU @@ -116,7 +117,7 @@ do_start () { test "`uname`" != "NetBSD" || xenbackendd $XENBACKENDD_ARGS echo Starting QEMU as disk backend for dom0 test -z "$QEMU_XEN" && QEMU_XEN=/usr/lib/xen/bin/qemu-system-i386 - $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize -monitor /dev/null + $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize -monitor /dev/null -pidfile $QEMU_PIDFILE } do_stop () { echo Stopping xenconsoled @@ -126,6 +127,13 @@ do_stop () { rm -f $XENCONSOLED_PIDFILE fi + echo Stopping QEMU + if read 2>/dev/null <$QEMU_PIDFILE pid; then + kill $pid + while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + rm -f $QEMU_PIDFILE + fi + echo WARNING: Not stopping xenstored, as it cannot be restarted. } |