From c23e8e7d5082cbf68611135af24d4a8ec38cb708 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 5 Feb 2013 11:31:10 +0000 Subject: xencommons: redirect serial and parallel to /dev/null Upstream QEMU doesn't support -nographic with -daemonize unless monitor, serial and parallel outputs are all redirected: /* According to documentation and historically, -nographic redirects * serial port, parallel port and monitor to stdio, which does not work * with -daemonize. We can redirect these to null instead, but since * -nographic is legacy, let's just error out. * We disallow -nographic only if all other ports are not redirected * explicitly, to not break existing legacy setups which uses * -nographic _and_ redirects all ports explicitly - this is valid * usage, -nographic is just a no-op in this case. */ Considering that we do want to redirect them to /dev/null anyway, do so. Signed-off-by: Stefano Stabellini Tested-by: Sander Eikelenboom Acked-by: Ian Campbell [ ijc -- handled reject vs 26352:9a1610c1e564 "xencommons: Stop QEMU in do_stop()" and rewrapped the resulting long line ] Committed-by: Ian Campbell --- tools/hotplug/Linux/init.d/xencommons | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/hotplug') diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index cc5e45c5bf..20afcc0a3b 100644 --- a/tools/hotplug/Linux/init.d/xencommons +++ b/tools/hotplug/Linux/init.d/xencommons @@ -117,7 +117,9 @@ 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 -pidfile $QEMU_PIDFILE + $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ + -monitor /dev/null -serial /dev/null -parallel /dev/null \ + -pidfile $QEMU_PIDFILE } do_stop () { echo Stopping xenconsoled -- cgit v1.2.3