* [PATCH] Stop QEMU in do_stop() in xencommons script.
@ 2013-01-03 17:12 Wei Liu
2013-01-09 11:22 ` Wei Liu
2013-01-11 12:24 ` Ian Campbell
0 siblings, 2 replies; 4+ messages in thread
From: Wei Liu @ 2013-01-03 17:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu
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>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Stop QEMU in do_stop() in xencommons script.
2013-01-03 17:12 [PATCH] Stop QEMU in do_stop() in xencommons script Wei Liu
@ 2013-01-09 11:22 ` Wei Liu
2013-01-09 11:28 ` Ian Campbell
2013-01-11 12:24 ` Ian Campbell
1 sibling, 1 reply; 4+ messages in thread
From: Wei Liu @ 2013-01-09 11:22 UTC (permalink / raw)
To: xen-devel@lists.xen.org; +Cc: ian.jackson, wei.liu2, stefano.stabellini
Ian and Stefano, do you have any input on this?
Wei.
On Thu, 2013-01-03 at 17:12 +0000, Wei Liu wrote:
> 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>
> ---
> 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.
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Stop QEMU in do_stop() in xencommons script.
2013-01-09 11:22 ` Wei Liu
@ 2013-01-09 11:28 ` Ian Campbell
0 siblings, 0 replies; 4+ messages in thread
From: Ian Campbell @ 2013-01-09 11:28 UTC (permalink / raw)
To: Wei Liu; +Cc: Stefano Stabellini, Ian Jackson, xen-devel@lists.xen.org
On Wed, 2013-01-09 at 11:22 +0000, Wei Liu wrote:
> Ian and Stefano, do you have any input on this?
It looks good to me, I'm just behind on going through my queue of
patches to consider, sorry.
I see you've copied the kill loop from the xenconsoled stuff, but I do
wonder if perhaps in both cases there ought to be a sleep between the
initial kill and the first kill -9, to give the process a chance to exit
gracefully. I don't see this as a blocker for this patch though.
>
> Wei.
>
> On Thu, 2013-01-03 at 17:12 +0000, Wei Liu wrote:
> > 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>
> > ---
> > 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.
> > }
> >
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Stop QEMU in do_stop() in xencommons script.
2013-01-03 17:12 [PATCH] Stop QEMU in do_stop() in xencommons script Wei Liu
2013-01-09 11:22 ` Wei Liu
@ 2013-01-11 12:24 ` Ian Campbell
1 sibling, 0 replies; 4+ messages in thread
From: Ian Campbell @ 2013-01-11 12:24 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel@lists.xen.org
On Thu, 2013-01-03 at 17:12 +0000, Wei Liu wrote:
> 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 + applied, thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-11 12:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-03 17:12 [PATCH] Stop QEMU in do_stop() in xencommons script Wei Liu
2013-01-09 11:22 ` Wei Liu
2013-01-09 11:28 ` Ian Campbell
2013-01-11 12:24 ` Ian Campbell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).