From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH] Stop QEMU in do_stop() in xencommons script. Date: Thu, 3 Jan 2013 17:12:38 +0000 Message-ID: <1357233158-13847-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Wei Liu List-Id: xen-devel@lists.xenproject.org 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 --- tools/hotplug/Linux/init.d/xencommons | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index cc8177e..cc5e45c 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. } -- 1.7.10.4