- Devel - libvirt List Archives

[Libvir] PATCH: Don't auto-set VNC port to 5900+domid
by Daniel P. Berrange 26 Feb '07

26 Feb '07

The current code for stuffing the VNC port number into the XML looks in XenStore for the VNC port number, and if it does not find it there falls back to using 5900+domid. This is a problem because it leaves open a race condition where the VNC daemon for a guest may not have started up yet, and so if an app requests the XML at this time it'll get potentially bogus port number info. In the best case there will be nothing listening on the bogus port, in the worst case a completely different domain will be listening on that port. This scenario is described here http://www.redhat.com/archives/et-mgmt-tools/2007-February/msg00115.html The reason we have the 5900+domid rule in there is to support Xen 3.0.2 or earlier, where the port number was never stored in XenStore. For any Xen 3.0.3 or later, we should basically never use the 5900+domid fallback rule. So the attached patch makes it conditional on xendConfigVersion < 2 Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 1

[Libvir] Logging/auditing incoming connections to libvirtd [repost]
by Richard W.M. Jones 26 Feb '07

26 Feb '07

2 1

Re: [Libvir] [patch 5/9] Add autostart support to virsh
by Daniel P. Berrange 26 Feb '07

26 Feb '07

On Thu, Feb 22, 2007 at 11:04:53AM +0000, Mark McLoughlin wrote: > Add "autostart" and "net-autostart" commands > > Also, cleanup the "list" and "net-list" commands a bit > and add autostart info to them I'm wondering whether we need to think about compatability for the virsh commands. We've previously discussed issues around output format stability but never really came up against the issue until now. My concern would be someone grok'ing the 'virsh list' output and now suddenly getting an extra data item at the end of the line. I think it's probably sufficient to just add the autostart flag display to the 'virsh dominfo' command, and not the 'list' command - its not the kind of data you need to see all that often, so I think we could leave it out of the 'list' command. If we were to extend the output of 'list' I reckon I'd prioritise 'memory' and 'vcpu count' above autostart. Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 2

Re: [Libvir] [patch 9/9] Implement better error reporting [repost]
by Richard W.M. Jones 24 Feb '07

24 Feb '07

2 1

Re: [Libvir] PATCH: Autodetect QEMU version [repost]
by Richard W.M. Jones 24 Feb '07

24 Feb '07

2 1

Re: [Libvir] [patch 3/3] Add libvirt_qemud init script
by Daniel P. Berrange 24 Feb '07

24 Feb '07

On Fri, Feb 23, 2007 at 12:16:00PM +0000, Mark McLoughlin wrote: > Add a Red Hat style init script, using the service name > libvirt_qemud. I'm wondering about the future where we have Rich's libvirtd to start up too. Perhaps we should call the init script just 'libvirtd' and in the future it can either start both libvirt_qemud & libvirtd or if we merge the two, just start libvirtd. That way we won't have to worry about possible renaming of the init script during an update. That question aside, the patches all look fine to me. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 4

[Libvir] Remote patch, 2007/02/19
by Richard W.M. Jones 23 Feb '07

23 Feb '07

Just for everyone's information. http://annexia.org/tmp/libvirt-tls-20070219.patch -- Emerging Technologies, Red Hat http://et.redhat.com/~rjones/ 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 "[Negative numbers] darken the very whole doctrines of the equations and make dark of the things which are in their nature excessively obvious and simple" (Francis Maseres FRS, mathematician, 1759)

2 8

[Libvir] __attribute__((constructor)) anyone?
by Richard W.M. Jones 23 Feb '07

23 Feb '07

Would anyone object to a patch using __attribute__((constructor)) throughout libvirt rather than all this if(!initialised) initialise() stuff? Rich. -- Emerging Technologies, Red Hat http://et.redhat.com/~rjones/ 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 "[Negative numbers] darken the very whole doctrines of the equations and make dark of the things which are in their nature excessively obvious and simple" (Francis Maseres FRS, mathematician, 1759)

3 4

[Libvir] [patch 3/3] Add libvirt_qemud init script
by Mark McLoughlin 23 Feb '07

23 Feb '07

Add a Red Hat style init script, using the service name libvirt_qemud. Also add a --with-init-scripts configure argument to allow us to add other flavour init scripts. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/Makefile.am =================================================================== --- libvirt.orig/qemud/Makefile.am +++ libvirt/qemud/Makefile.am @@ -19,3 +19,24 @@ libvirt_qemud_LDFLAGS = $(LIBXML_LIBS) $ libvirt_qemud_DEPENDENCIES = libvirt_qemud_LDADD = +EXTRA_DIST = libvirt_qemud.init.in + +if LIBVIRT_INIT_SCRIPTS_RED_HAT +libvirt_qemud.init: libvirt_qemud.init.in + sed \ + -e s!\@localstatedir\@!@localstatedir@! \ + -e s!\@sbindir\@!@sbindir@! \ + -e s!\@sysconfdir\@!@sysconfdir@! \ + < $< > $@ + chmod a+x libvirt_qemud.init + +install-exec-local: libvirt_qemud.init + mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d + install -m 0755 $(srcdir)/libvirt_qemud.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt_qemud + +uninstall-local: + rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt_qemud + rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : + +CLEANFILES = libvirt_qemud.init +endif # DBUS_INIT_SCRIPTS_RED_HAT Index: libvirt/qemud/libvirt_qemud.init.in =================================================================== --- /dev/null +++ libvirt/qemud/libvirt_qemud.init.in @@ -0,0 +1,75 @@ +#!/bin/sh + +# libvirt_qemud: QEMU and virtual network management daemon +# +# chkconfig: 345 97 03 +# description: This is a daemon for managing QEMU guest instances +# and libvirt virtual networks +# See http://libvirt.org +# +# processname: libvirt_qemud +# pidfile: @localstatedir@/run/libvirt_qemud.pid +# + +# Sanity checks. +[ -x @sbindir@/libvirt_qemud ] || exit 0 + +# Source function library. +. @sysconfdir@/rc.d/init.d/functions + +SERVICE=libvirt_qemud + +RETVAL=0 + +start() { + echo -n $"Starting $SERVICE daemon: " + daemon $SERVICE --system --daemon + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE +} + +stop() { + echo -n $"Stopping $SERVICE daemon: " + + killproc $SERVICE -TERM + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f @localstatedir@/lock/subsys/$SERVICE + rm -f @localstatedir@/run/$SERVICE.pid + fi +} + +restart() { + stop + start +} + +reload() { + echo -n $"Reloading $SERVICE configuration: " + + killproc $SERVICE -HUP + RETVAL=$? + echo + return $RETVAL +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 + ;; + status) + status $SERVICE + RETVAL=$? + ;; + condrestart) + [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + exit 1 + ;; +esac +exit $RETVAL Index: libvirt/configure.in =================================================================== --- libvirt.orig/configure.in +++ libvirt/configure.in @@ -100,6 +100,23 @@ AC_DEFINE_UNQUOTED(QEMUD_PID_FILE, "$QEM AC_MSG_RESULT($QEMUD_PID_FILE) dnl +dnl init script flavor +dnl +AC_MSG_CHECKING([for init script flavor]) +AC_ARG_WITH(init-script, + AC_HELP_STRING([--with-init-scripts=[redhat|auto|none]], + [Style of init scripts to install (defaults to auto)])) +if test "x$with_init_scripts" = "x" -o "x$with_init_scripts" = "xauto"; then + if test -f /etc/redhat-release ; then + with_init_scripts=redhat + else + with_init_scripts=none + fi +fi +AM_CONDITIONAL(LIBVIRT_INIT_SCRIPTS_RED_HAT, test x$with_init_scripts = xredhat) +AC_MSG_RESULT($with_init_scripts) + +dnl dnl allow the creation of iptables rules in chains with a dnl specific prefix rather than in the standard toplevel chains dnl --

1 0

[Libvir] [patch 2/3] Add ability to write PID file to qemud
by Mark McLoughlin 23 Feb '07

23 Feb '07

Add a --pid-file arg to libvirt_qemud and, in daemon mode, default to writing a PID file. Passing --pid-file="" disables writing a PID file. Also add a --with-qemud-pid-file arg to configure. Passing --with-pid-file=none disables the default PID file path. The default path is /var/run/libvirt_qemud.pid in order to match the service name. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/configure.in =================================================================== --- libvirt.orig/configure.in +++ libvirt/configure.in @@ -87,6 +87,21 @@ if test x"$enable_debug" = x"yes"; then fi dnl +dnl PID file +dnl +AC_MSG_CHECKING([where to write libvirt_qemud PID file]) +AC_ARG_WITH(pid-file, AC_HELP_STRING([--with-qemud-pid-file=[pidfile|none]], [PID file for libvirt_qemud])) +if test "x$with_qemud_pid_file" == "x" ; then + QEMUD_PID_FILE="$localstatedir/run/libvirt_qemud.pid" +elif test "x$with_qemud_pid_file" == "xnone" ; then + QEMUD_PID_FILE="" +else + QEMUD_PID_FILE="$with_qemud_pid_file" +fi +AC_DEFINE_UNQUOTED(QEMUD_PID_FILE, "$QEMUD_PID_FILE", [PID file path for qemud]) +AC_MSG_RESULT($QEMUD_PID_FILE) + +dnl dnl allow the creation of iptables rules in chains with a dnl specific prefix rather than in the standard toplevel chains dnl Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -301,6 +301,42 @@ static int qemudGoDaemon(void) { } } +static int qemudWritePidFile(const char *pidFile) { + int fd; + FILE *fh; + + if (pidFile[0] == '\0') + return 0; + + if ((fd = open(pidFile, O_WRONLY|O_CREAT|O_EXCL, 0644)) < 0) { + qemudLog(QEMUD_ERR, "Failed to open pid file '%s' : %s", + pidFile, strerror(errno)); + return -1; + } + + if (!(fh = fdopen(fd, "w"))) { + qemudLog(QEMUD_ERR, "Failed to fdopen pid file '%s' : %s", + pidFile, strerror(errno)); + close(fd); + return -1; + } + + if (fprintf(fh, "%lu\n", (unsigned long)getpid()) < 0) { + qemudLog(QEMUD_ERR, "Failed to write to pid file '%s' : %s", + pidFile, strerror(errno)); + close(fd); + return -1; + } + + if (fclose(fh) == EOF) { + qemudLog(QEMUD_ERR, "Failed to close pid file '%s' : %s", + pidFile, strerror(errno)); + return -1; + } + + return 0; +} + static int qemudListenUnix(struct qemud_server *server, const char *path, int readonly) { struct qemud_socket *sock = calloc(1, sizeof(struct qemud_socket)); @@ -1481,12 +1517,15 @@ int main(int argc, char **argv) { struct qemud_server *server; struct sigaction sig_action; int sigpipe[2]; + char *pid_file = NULL; + int ret = 1; struct option opts[] = { { "verbose", no_argument, &verbose, 1}, { "daemon", no_argument, &godaemon, 1}, { "system", no_argument, &sys, 1}, { "timeout", required_argument, 0, 't'}, + { "pid-file", required_argument, 0, 'p'}, {0, 0, 0, 0} }; @@ -1495,7 +1534,7 @@ int main(int argc, char **argv) { int c; char *tmp; - c = getopt_long(argc, argv, "vsdt:", opts, &optidx); + c = getopt_long(argc, argv, "vsdt:p:", opts, &optidx); if (c == -1) { break; @@ -1522,6 +1561,11 @@ int main(int argc, char **argv) { if (timeout <= 0) timeout = -1; break; + + case 'p': + pid_file = strdup(optarg); + break; + case '?': return 2; break; @@ -1539,7 +1583,7 @@ int main(int argc, char **argv) { qemudSetNonBlock(sigpipe[1]) < 0) { qemudLog(QEMUD_ERR, "Failed to create pipe: %s", strerror(errno)); - return 1; + goto error1; } sigwrite = sigpipe[1]; @@ -1562,14 +1606,19 @@ int main(int argc, char **argv) { if (pid < 0) { qemudLog(QEMUD_ERR, "Failed to fork as daemon: %s", strerror(errno)); - return 1; + goto error1; } if (pid > 0) - return 0; + goto out; + + if (qemudWritePidFile(pid_file ? pid_file : QEMUD_PID_FILE) < 0) + goto error1; } - if (!(server = qemudInitialize(sys, sigpipe[0]))) - return 2; + if (!(server = qemudInitialize(sys, sigpipe[0]))) { + ret = 2; + goto error2; + } qemudRunLoop(server, timeout); @@ -1580,7 +1629,18 @@ int main(int argc, char **argv) { if (godaemon) closelog(); - return 0; + out: + ret = 0; + + error2: + if (godaemon) + unlink(pid_file ? pid_file : QEMUD_PID_FILE); + + error1: + if (pid_file) + free(pid_file); + + return ret; } /* --

1 0