- Devel - libvirt List Archives

[Libvir] [patch 1/3] Add UUID generation to qemud
by Mark McLoughlin 26 Feb '07

26 Feb '07

If a guest or network does not have a UUID assigned to it, we generate a random UUID preferably using /dev/urandom, but falling back to pseudo-random number generation if that fails. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/Makefile.am =================================================================== --- libvirt.orig/qemud/Makefile.am +++ libvirt/qemud/Makefile.am @@ -9,7 +9,8 @@ libvirt_qemud_SOURCES = qemud.c internal dispatch.c dispatch.h \ conf.c conf.h \ bridge.c bridge.h \ - iptables.c iptables.h + iptables.c iptables.h \ + uuid.c uuid.h #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirt_qemud_CFLAGS = \ -I$(top_srcdir)/include -I$(top_builddir)/include $(LIBXML_CFLAGS) \ Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -45,6 +45,7 @@ #include "conf.h" #include "driver.h" #include "iptables.h" +#include "uuid.h" static int qemudParseUUID(const char *uuid, unsigned char *rawuuid) { @@ -689,11 +690,13 @@ static struct qemud_vm_def *qemudParseXM obj = xmlXPathEval(BAD_CAST "string(/domain/uuid[1])", ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - /* XXX auto-generate a UUID */ - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "missing uuid element"); - goto error; - } - if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { + int err; + if ((err = qemudGenerateUUID(def->uuid))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to generate UUID: %s", strerror(err)); + goto error; + } + } else if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "malformed uuid element"); goto error; } @@ -1650,11 +1653,13 @@ static struct qemud_network_def *qemudPa obj = xmlXPathEval(BAD_CAST "string(/network/uuid[1])", ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - /* XXX auto-generate a UUID */ - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "missing uuid element"); - goto error; - } - if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { + int err; + if ((err = qemudGenerateUUID(def->uuid))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to generate UUID: %s", strerror(err)); + goto error; + } + } else if (qemudParseUUID((const char *)obj->stringval, def->uuid) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "malformed uuid element"); goto error; } Index: libvirt/qemud/uuid.c =================================================================== --- /dev/null +++ libvirt/qemud/uuid.c @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Mark McLoughlin <markmc(a)redhat.com> + */ + +#include "config.h" + +#include "uuid.h" + +#include <errno.h> +#include <fcntl.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +#include "protocol.h" +#include "internal.h" + +static int +qemudGenerateRandomBytes(unsigned char *buf, + int buflen) +{ + int fd; + + if ((fd = open("/dev/urandom", O_RDONLY)) < 0) + return errno; + + while (buflen > 0) { + int n; + + if ((n = read(fd, buf, buflen)) <= 0) { + if (errno == EINTR) + continue; + close(fd); + return n < 0 ? errno : ENODATA; + } + + buf += n; + buflen -= n; + } + + close(fd); + + return 0; +} + +static int +qemudGeneratePseudoRandomBytes(unsigned char *buf, + int buflen) +{ + srand(time(NULL)); + while (buflen > 0) { + *buf = (int) (255.0 * (rand() / (double) RAND_MAX)); + buflen--; + } + + return 0; +} + +int +qemudGenerateUUID(unsigned char *uuid) +{ + int err; + + if ((err = qemudGenerateRandomBytes(uuid, QEMUD_UUID_RAW_LEN))) + qemudLog(QEMUD_WARN, + "Falling back to pseudorandom UUID, " + "failed to generate random bytes: %s", strerror(err)); + + return qemudGeneratePseudoRandomBytes(uuid, QEMUD_UUID_RAW_LEN); +} + +/* + * Local variables: + * indent-tabs-mode: nil + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ + Index: libvirt/qemud/uuid.h =================================================================== --- /dev/null +++ libvirt/qemud/uuid.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2007 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Mark McLoughlin <markmc(a)redhat.com> + */ + +#ifndef __QEMUD_UUID_H__ +#define __QEMUD_UUID_H__ + +int qemudGenerateUUID(unsigned char *uuid); + +#endif /* __QEMUD_UUID_H__ */ --

1 0

[Libvir] [patch 0/3] Automatically generate UUIDs in qemud
by Mark McLoughlin 26 Feb '07

26 Feb '07

Hey, We currently require guests and networks to have a UUID defined. This patch automatically generates a UUID if one isn't supplied. This is needed because the default network we install won't have a UUID assigned, since we'll want the UUID to be different on different hosts. Cheers, Mark. --

1 0

[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 25 Feb '07

25 Feb '07

2 1

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

25 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 23 Feb '07

23 Feb '07

2 1

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

23 Feb '07

2 1

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

23 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

[Libvir] [patch 1/3] Move libvirt_qemud to /usr/sbin
by Mark McLoughlin 23 Feb '07

23 Feb '07

Move libvirt_qemud to /usr/sbin since it is now "designed to be executed by hand" ... i.e. we're adding an initscript for it rather than just having libvirt start it automatically. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/Makefile.am =================================================================== --- libvirt.orig/qemud/Makefile.am +++ libvirt/qemud/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = @LIBXML_CFLAGS@ -libexec_PROGRAMS = libvirt_qemud +sbin_PROGRAMS = libvirt_qemud libvirt_qemud_SOURCES = qemud.c internal.h protocol.h \ driver.c driver.h \ Index: libvirt/src/Makefile.am =================================================================== --- libvirt.orig/src/Makefile.am +++ libvirt/src/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_builddir)/include -I@top_srcdir@/include @LIBXML_CFLAGS@ -I@top_srcdir@/qemud \ - -DBINDIR=\""$(libexecdir)"\" -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + -DBINDIR=\""$(libexecdir)"\" -DSBINDIR=\""$(sbindir)"\" -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -DLOCAL_STATE_DIR=\""$(localstatedir)"\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" DEPS = libvirt.la Index: libvirt/src/qemu_internal.c =================================================================== --- libvirt.orig/src/qemu_internal.c +++ libvirt/src/qemu_internal.c @@ -99,8 +99,8 @@ static const char * qemuFindServerPath(void) { static const char *serverPaths[] = { - BINDIR "/libvirt_qemud", - BINDIR "/libvirt_qemud_dbg", + SBINDIR "/libvirt_qemud", + SBINDIR "/libvirt_qemud_dbg", NULL }; int i; --

1 0

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

23 Feb '07

Hey, In order to run autostart networks and guests at boot, we need an init script. Here she comes ... Cheers, Mark. --

1 0

[Libvir] PATCH: Autodetect QEMU version
by Daniel P. Berrange 23 Feb '07

23 Feb '07

When I tested out the libvirt 0.2.0 in Fedora rawhide I discovered that the syntax for specifying VNC display numbers changes in QEMU 0.9.0. Previously you would use -vnc 7 Now you need to use -vnc :7 For current Fedora RPM I just hacked in a workaround to always add ':', but we need to be able to detect the version properly. So I'm attaching a patch which spawns '/usr/bin/qemu' and groks its command line help to extract the version number. It then uses appropriate VNC argument syntax based on the version. At the same time I also check for whether -no-kqemu is available so we can turn off KQEMU support if it is not available. 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 4

Re: [Libvir] [patch 3/9] Re-factor chunks of qemuds config handling
by Daniel P. Berrange 23 Feb '07

23 Feb '07

On Thu, Feb 22, 2007 at 11:04:37AM +0000, Mark McLoughlin wrote: > The easiest way to explain where I'm coming from with > this patch is to look at the current qemudLoadConfigXML(). > > It's used in three places: > > 1) Loading at startup - you want (a) and (b), but you > want to check whether the name matches the filename > before doing (b) > > 2) Create() - you want (a) and (b) > > 3) Define() - you want (a), (b) and (c) > > So, mostly I'm just splitting the function into three > and making the logic above much more obvious. It should > also make some of the autostart code much more > straightforward. Hard to tell from the raw patch exactly how it fits together, but the principles of the patch all sound good to me - centralizing alot of the pointer munging into one place & generally tidying stuff up. BTW, your mailer alias for this list is wrong - its generating a bogus reply to against libvirt hacker dudes <libvirt-list(a)redhat.com> Instead of libvirt hacker dudes <libvir-list(a)redhat.com> Note, the extra 't' in the former - which makes replying to your mails a little error prone - several went to dev null... 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] Autostarting guests and networks
by Mark McLoughlin 23 Feb '07

23 Feb '07

Hey, We need some way to have libvirtd automatically start guests and networks. We had said we should have autostart directories containing config files of guests/networks which should be autostarted. One problem I see with that is that we'd need a new API to define autostart configs. So, I suggest we add an "autostart" flag to the toplevel element of the configs. We could discuss this one at length and I, for one, don't like using the XML format as an API like this, but ... comments? Cheers, Mark.

6 7

Re: [Libvir] [patch 0/9] Revised autostart patches
by Daniel P. Berrange 22 Feb '07

22 Feb '07

On Thu, Feb 22, 2007 at 11:04:08AM +0000, Mark McLoughlin wrote: > Hey, > Here's the autostart patches again. If you're just > looking for what's changed, it's probably fine to just look > at patch 3 (some heavy re-factoring to make the autostart > stuff easier) and patch 7 (maintains symlinks in the autostart > dirs instead of config files). Aside from the note about 'virsh list' command changes, it all looks good to me. Unless anyone else has objections I'd say commit this to CVS - I want to re-do the handling of the QEMU monitor to detect errors at startup and would rather work with your big refactoring already applied.. 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 -=|

1 0

Re: [Libvir] [patch 1/9] Merge the active and inactive network/guest lists
by Daniel P. Berrange 22 Feb '07

22 Feb '07

On Thu, Feb 22, 2007 at 11:04:20AM +0000, Mark McLoughlin wrote: > Merge the ->activevms and ->inactivevms into a single > ->vms list where each VM has a "active" flag in order > to make things easier to manage. That looks good now with the qemudIsActiveVM() helper function. 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 -=|

1 0

[Libvir] PATCH: Don't leave a 'braindead' Xen VM when device hotplug fails
by Daniel P. Berrange 22 Feb '07

22 Feb '07

Because of the way Xen guest creation works, the virDomainCreateLinux implementation for Xen is really a three stage process - first we create the raw domain, then we have to wait for device hotplug to complete, finally unpausing the domain. Currently if the device hotplug fails we error out, leaving a 'braindead' VM lying around in the paused state. This is rather confusing for users leading to people thinking everything was OK, and thus unpausing the guest manually, then filing bug reports when they find they've no devices in the guest VM ! The xm tool by comparison will tear down the VM if the device hotplug fails so the user doesn't see the paused domain after the failure. The attached patch re-arranges the Xen driver for creating new domains to do the same kind of thing - upon any failure we explicitly destroy the halfdead domain 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 2

[Libvir] [PATCH]Guard for Dom0 by virsh domain stop commands
by Kazuki　Mizushima 22 Feb '07

22 Feb '07

Hi, I think Domain0 should NOT stop by virsh domain stop commands. (like shutdown, reboot, destroy). But virsh shudown and reboot commands are still available for Dom0. This patch intends to disable these two commands for Dom0. Internal processing of these two commands is following 1)Send shutdown or reboot to Xend (Guard of xend) 2)If 1) is failed, shutdown/reboot is executed by xenstore. (Not Guard) This patch removes 2) ,that is as same as destroy processing. Signed-off-by: Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> Thanks, Kazuki Mizushima Index: xs_internal.c (libvirt-0.2.0) ---------------------------------------------------------------------- --- xs_internal.c 2007-02-15 01:11:54.000000000 +0900 +++ xs_internal.c.guard 2007-02-22 00:31:55.000000000 +0900 @@ -54,8 +54,8 @@ static virDriver xenStoreDriver = { xenStoreDomainLookupByName, /* domainLookupByName */ NULL, /* domainSuspend */ NULL, /* domainResume */ - xenStoreDomainShutdown, /* domainShutdown */ - xenStoreDomainReboot, /* domainReboot */ + NULL, /* domainShutdown */ + NULL, /* domainReboot */ NULL, /* domainDestroy */ xenStoreDomainGetOSType, /* domainGetOSType */ xenStoreDomainGetMaxMemory, /* domainGetMaxMemory */ ----------------------------------------------------------------------

3 4

[Libvir] [patch 9/9] Actually autostart guests and networks
by Mark McLoughlin 22 Feb '07

22 Feb '07

Add qemudAutostartConfigs() to autostart guests and networks. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1972,11 +1972,49 @@ int qemudScanConfigDir(struct qemud_serv return 0; } +static +void qemudAutostartConfigs(struct qemud_server *server) { + struct qemud_network *network; + struct qemud_vm *vm; + + network = server->networks; + while (network != NULL) { + struct qemud_network *next = network->next; + + if (network->autostart && + !qemudIsActiveNetwork(network) && + qemudStartNetworkDaemon(server, network) < 0) + qemudLog(QEMUD_ERR, "Failed to autostart network '%s'", + network->def->name); + + network = next; + } + + vm = server->vms; + while (vm != NULL) { + struct qemud_vm *next = vm->next; + + if (vm->autostart && + !qemudIsActiveVM(vm) && + qemudStartVMDaemon(server, vm) < 0) + qemudLog(QEMUD_ERR, "Failed to autostart VM '%s'", + vm->def->name); + + vm = next; + } +} + /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { if (qemudScanConfigDir(server, server->configDir, server->autostartDir, 1) < 0) return -1; - return qemudScanConfigDir(server, server->networkConfigDir, server->networkAutostartDir, 0); + + if (qemudScanConfigDir(server, server->networkConfigDir, server->networkAutostartDir, 0) < 0) + return -1; + + qemudAutostartConfigs(server); + + return 0; } /* Simple grow-on-demand string buffer */ --

1 0

[Libvir] [patch 8/9] Cleanup configDir members
by Mark McLoughlin 22 Feb '07

22 Feb '07

qemudInitPaths() is starting to get a little unwieldly so put the config directory paths in an array. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -54,6 +54,15 @@ typedef enum { #endif } qemudLogPriority; +typedef enum { + QEMUD_DIR_CONFIG = 0, + QEMUD_DIR_AUTOSTART, + QEMUD_DIR_NETWORK_CONFIG, + QEMUD_DIR_NETWORK_AUTOSTART, + + QEMUD_N_CONFIG_DIRS +} qemudConfigDirType; + /* Different types of QEMU acceleration possible */ enum qemud_vm_virt_type { QEMUD_VIRT_QEMU, @@ -293,10 +302,11 @@ struct qemud_server { struct qemud_network *networks; brControl *brctl; iptablesContext *iptables; - char configDir[PATH_MAX]; - char networkConfigDir[PATH_MAX]; - char autostartDir[PATH_MAX]; - char networkAutostartDir[PATH_MAX]; + char configDirs[QEMUD_N_CONFIG_DIRS][PATH_MAX]; + char *configDir; + char *autostartDir; + char *networkConfigDir; + char *networkAutostartDir; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; unsigned int shutdown : 1; Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -354,15 +354,22 @@ static int qemudListenUnix(struct qemud_ return 0; } -static int qemudInitPaths(int sys, - char *configDir, - char *networkConfigDir, - char *autostartDir, - char *networkAutostartDir, +static int qemudInitPaths(struct qemud_server *server, + int sys, char *sockname, char *roSockname, int maxlen) { + const char *paths[] = { + "libvirt/qemu", /* QEMUD_DIR_DOMAINS */ + "libvirt/qemu/autostart", /* QEMUD_DIR_AUTO_DOMAINS */ + "libvirt/qemu/networks", /* QEMUD_DIR_NETWORKS */ + "libvirt/qemu/networks/autostart", /* QEMUD_DIR_AUTO_NETWORKS */ + }; + uid_t uid; + struct passwd *pw; + char base[PATH_MAX] = SYSCONF_DIR "/"; + int i; uid = geteuid(); @@ -372,18 +379,6 @@ static int qemudInitPaths(int sys, return -1; } - if (snprintf(configDir, maxlen, "%s/libvirt/qemu", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(networkConfigDir, maxlen, "%s/libvirt/qemu/networks", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(networkAutostartDir, maxlen, "%s/libvirt/qemu/networks/autostart", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - if (snprintf(sockname, maxlen, "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -394,29 +389,22 @@ static int qemudInitPaths(int sys, unlink(sockname); } else { - struct passwd *pw; - if (!(pw = getpwuid(uid))) { qemudLog(QEMUD_ERR, "Failed to find user record for uid '%d': %s", uid, strerror(errno)); return -1; } - if (snprintf(configDir, maxlen, "%s/.libvirt/qemu", pw->pw_dir) >= maxlen) - goto snprintf_error; - - if (snprintf(networkConfigDir, maxlen, "%s/.libvirt/qemu/networks", pw->pw_dir) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartDir, maxlen, "%s/.libvirt/qemu/autostart", pw->pw_dir) >= maxlen) + if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) goto snprintf_error; - if (snprintf(networkAutostartDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) + if (snprintf(base, PATH_MAX, "%s/.", pw->pw_dir) >= PATH_MAX) goto snprintf_error; + } - if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) + for (i = 0; i < QEMUD_N_CONFIG_DIRS; i++) + if (snprintf(server->configDirs[i], PATH_MAX, "%s%s", base, paths[i]) >= PATH_MAX) goto snprintf_error; - } return 0; @@ -443,11 +431,14 @@ static struct qemud_server *qemudInitial roSockname[0] = '\0'; - if (qemudInitPaths(sys, server->configDir, server->networkConfigDir, - server->autostartDir, server->networkAutostartDir, - sockname, roSockname, PATH_MAX) < 0) + if (qemudInitPaths(server, sys, sockname, roSockname, PATH_MAX) < 0) goto cleanup; + server->configDir = server->configDirs[QEMUD_DIR_CONFIG]; + server->autostartDir = server->configDirs[QEMUD_DIR_AUTOSTART]; + server->networkConfigDir = server->configDirs[QEMUD_DIR_NETWORK_CONFIG]; + server->networkAutostartDir = server->configDirs[QEMUD_DIR_NETWORK_AUTOSTART]; + if (qemudListenUnix(server, sockname, 0) < 0) goto cleanup; --

1 0

[Libvir] [patch 7/9] Add autostart QEMU implementation
by Mark McLoughlin 22 Feb '07

22 Feb '07

Actually implement the autostart API in qemud by creating symlinks in the autostart directories. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -205,6 +205,7 @@ struct qemud_vm { int ntapfds; char configFile[PATH_MAX]; + char autostartLink[PATH_MAX]; struct qemud_vm_def *def; /* The current definition */ struct qemud_vm_def *newDef; /* New definition to activate at shutdown */ @@ -241,6 +242,7 @@ struct qemud_network_def { /* Virtual Network runtime state */ struct qemud_network { char configFile[PATH_MAX]; + char autostartLink[PATH_MAX]; struct qemud_network_def *def; /* The current definition */ struct qemud_network_def *newDef; /* New definition to activate at shutdown */ @@ -293,6 +295,8 @@ struct qemud_server { iptablesContext *iptables; char configDir[PATH_MAX]; char networkConfigDir[PATH_MAX]; + char autostartDir[PATH_MAX]; + char networkAutostartDir[PATH_MAX]; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; unsigned int shutdown : 1; Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -137,7 +137,7 @@ qemudMakeConfigPath(const char *configDi return 0; } -static int +int qemudEnsureDir(const char *path) { struct stat st; @@ -1287,6 +1287,14 @@ qemudSaveVMDef(struct qemud_server *serv "cannot construct config file path"); return -1; } + + if (qemudMakeConfigPath(server->autostartDir, def->name, ".xml", + vm->autostartLink, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct autostart link path"); + vm->configFile[0] = '\0'; + return -1; + } } return qemudSaveConfig(server, vm, def); @@ -1666,6 +1674,14 @@ qemudSaveNetworkDef(struct qemud_server "cannot construct config file path"); return -1; } + + if (qemudMakeConfigPath(server->networkAutostartDir, def->name, ".xml", + network->autostartLink, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct autostart link path"); + network->configFile[0] = '\0'; + return -1; + } } return qemudSaveNetworkConfig(server, network, def); @@ -1735,11 +1751,105 @@ compareFileToNameSuffix(const char *file return 0; } +static int +checkLinkPointsTo(const char *checkLink, + const char *checkDest) +{ + char dest[PATH_MAX]; + char real[PATH_MAX]; + char checkReal[PATH_MAX]; + int n; + int passed = 0; + + /* read the link destination */ + if ((n = readlink(checkLink, dest, PATH_MAX)) < 0) { + switch (errno) { + case ENOENT: + case ENOTDIR: + break; + + case EINVAL: + qemudLog(QEMUD_WARN, "Autostart file '%s' is not a symlink", + checkLink); + break; + + default: + qemudLog(QEMUD_WARN, "Failed to read autostart symlink '%s': %s", + checkLink, strerror(errno)); + break; + } + + goto failed; + } else if (n >= PATH_MAX) { + qemudLog(QEMUD_WARN, "Symlink '%s' contents too long to fit in buffer", + checkLink); + goto failed; + } + + dest[n] = '\0'; + + /* make absolute */ + if (dest[0] != '/') { + char dir[PATH_MAX]; + char tmp[PATH_MAX]; + char *p; + + strncpy(dir, checkLink, PATH_MAX); + dir[PATH_MAX] = '\0'; + + if (!(p = strrchr(dir, '/'))) { + qemudLog(QEMUD_WARN, "Symlink path '%s' is not absolute", checkLink); + goto failed; + } + + if (p == dir) /* handle unlikely root dir case */ + p++; + + *p = '\0'; + + if (qemudMakeConfigPath(dir, dest, NULL, tmp, PATH_MAX) < 0) { + qemudLog(QEMUD_WARN, "Path '%s/%s' is too long", dir, dest); + goto failed; + } + + strncpy(dest, tmp, PATH_MAX); + dest[PATH_MAX] = '\0'; + } + + /* canonicalize both paths */ + if (!realpath(dest, real)) { + qemudLog(QEMUD_WARN, "Failed to expand path '%s' :%s", + dest, strerror(errno)); + strncpy(real, dest, PATH_MAX); + real[PATH_MAX] = '\0'; + } + + if (!realpath(checkDest, checkReal)) { + qemudLog(QEMUD_WARN, "Failed to expand path '%s' :%s", + checkDest, strerror(errno)); + strncpy(checkReal, checkDest, PATH_MAX); + checkReal[PATH_MAX] = '\0'; + } + + /* compare */ + if (strcmp(checkReal, real) != 0) { + qemudLog(QEMUD_WARN, "Autostart link '%s' is not a symlink to '%s', ignoring", + checkLink, checkReal); + goto failed; + } + + passed = 1; + + failed: + return passed; +} + static struct qemud_vm * qemudLoadConfig(struct qemud_server *server, const char *file, const char *path, - const char *xml) { + const char *xml, + const char *autostartLink) { struct qemud_vm_def *def; struct qemud_vm *vm; @@ -1765,6 +1875,11 @@ qemudLoadConfig(struct qemud_server *ser strncpy(vm->configFile, path, PATH_MAX); vm->configFile[PATH_MAX-1] = '\0'; + strncpy(vm->autostartLink, autostartLink, PATH_MAX); + vm->autostartLink[PATH_MAX-1] = '\0'; + + vm->autostart = checkLinkPointsTo(vm->autostartLink, vm->configFile); + return vm; } @@ -1772,7 +1887,8 @@ static struct qemud_network * qemudLoadNetworkConfig(struct qemud_server *server, const char *file, const char *path, - const char *xml) { + const char *xml, + const char *autostartLink) { struct qemud_network_def *def; struct qemud_network *network; @@ -1798,12 +1914,18 @@ qemudLoadNetworkConfig(struct qemud_serv strncpy(network->configFile, path, PATH_MAX); network->configFile[PATH_MAX-1] = '\0'; + strncpy(network->autostartLink, autostartLink, PATH_MAX); + network->autostartLink[PATH_MAX-1] = '\0'; + + network->autostart = checkLinkPointsTo(network->autostartLink, network->configFile); + return network; } static int qemudScanConfigDir(struct qemud_server *server, const char *configDir, + const char *autostartDir, int isGuest) { DIR *dir; struct dirent *entry; @@ -1819,6 +1941,7 @@ int qemudScanConfigDir(struct qemud_serv while ((entry = readdir(dir))) { char xml[QEMUD_MAX_XML_LEN]; char path[PATH_MAX]; + char autostartLink[PATH_MAX]; if (entry->d_name[0] == '.') continue; @@ -1829,13 +1952,19 @@ int qemudScanConfigDir(struct qemud_serv continue; } + if (qemudMakeConfigPath(autostartDir, entry->d_name, NULL, autostartLink, PATH_MAX) < 0) { + qemudLog(QEMUD_WARN, "Autostart link path '%s/%s' is too long", + autostartDir, entry->d_name); + continue; + } + if (!qemudReadFile(path, xml, QEMUD_MAX_XML_LEN)) continue; if (isGuest) - qemudLoadConfig(server, entry->d_name, path, xml); + qemudLoadConfig(server, entry->d_name, path, xml, autostartLink); else - qemudLoadNetworkConfig(server, entry->d_name, path, xml); + qemudLoadNetworkConfig(server, entry->d_name, path, xml, autostartLink); } closedir(dir); @@ -1845,9 +1974,9 @@ int qemudScanConfigDir(struct qemud_serv /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { - if (qemudScanConfigDir(server, server->configDir, 1) < 0) + if (qemudScanConfigDir(server, server->configDir, server->autostartDir, 1) < 0) return -1; - return qemudScanConfigDir(server, server->networkConfigDir, 0); + return qemudScanConfigDir(server, server->networkConfigDir, server->networkAutostartDir, 0); } /* Simple grow-on-demand string buffer */ Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -502,7 +502,12 @@ int qemudDomainUndefine(struct qemud_ser if (qemudDeleteConfig(server, vm->configFile, vm->def->name) < 0) return -1; + if (unlink(vm->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) + qemudLog(QEMUD_WARN, "Failed to delete autostart link '%s': %s", + vm->autostartLink, strerror(errno)); + vm->configFile[0] = '\0'; + vm->autostartLink[0] = '\0'; qemudRemoveInactiveVM(server, vm); @@ -539,6 +544,31 @@ int qemudDomainSetAutostart(struct qemud if (vm->autostart == autostart) return 0; + if (autostart) { + int err; + + if ((err = qemudEnsureDir(server->autostartDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create autostart directory %s: %s", + server->autostartDir, strerror(err)); + return -1; + } + + if (symlink(vm->configFile, vm->autostartLink) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to create symlink '%s' to '%s': %s", + vm->autostartLink, vm->configFile, strerror(errno)); + return -1; + } + } else { + if (unlink(vm->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to delete symlink '%s': %s", + vm->autostartLink, strerror(errno)); + return -1; + } + } + vm->autostart = autostart; return 0; @@ -657,7 +687,12 @@ int qemudNetworkUndefine(struct qemud_se if (qemudDeleteConfig(server, network->configFile, network->def->name) < 0) return -1; + if (unlink(network->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) + qemudLog(QEMUD_WARN, "Failed to delete autostart link '%s': %s", + network->autostartLink, strerror(errno)); + network->configFile[0] = '\0'; + network->autostartLink[0] = '\0'; qemudRemoveInactiveNetwork(server, network); @@ -750,6 +785,31 @@ int qemudNetworkSetAutostart(struct qemu if (network->autostart == autostart) return 0; + if (autostart) { + int err; + + if ((err = qemudEnsureDir(server->networkAutostartDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create autostart directory %s: %s", + server->networkAutostartDir, strerror(err)); + return -1; + } + + if (symlink(network->configFile, network->autostartLink) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to create symlink '%s' to '%s': %s", + network->autostartLink, network->configFile, strerror(errno)); + return -1; + } + } else { + if (unlink(network->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "Failed to delete symlink '%s': %s", + network->autostartLink, strerror(errno)); + return -1; + } + } + network->autostart = autostart; return 0; Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -357,6 +357,8 @@ static int qemudListenUnix(struct qemud_ static int qemudInitPaths(int sys, char *configDir, char *networkConfigDir, + char *autostartDir, + char *networkAutostartDir, char *sockname, char *roSockname, int maxlen) { @@ -376,6 +378,12 @@ static int qemudInitPaths(int sys, if (snprintf(networkConfigDir, maxlen, "%s/libvirt/qemu/networks", SYSCONF_DIR) >= maxlen) goto snprintf_error; + if (snprintf(autostartDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) + goto snprintf_error; + + if (snprintf(networkAutostartDir, maxlen, "%s/libvirt/qemu/networks/autostart", SYSCONF_DIR) >= maxlen) + goto snprintf_error; + if (snprintf(sockname, maxlen, "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -400,6 +408,12 @@ static int qemudInitPaths(int sys, if (snprintf(networkConfigDir, maxlen, "%s/.libvirt/qemu/networks", pw->pw_dir) >= maxlen) goto snprintf_error; + if (snprintf(autostartDir, maxlen, "%s/.libvirt/qemu/autostart", pw->pw_dir) >= maxlen) + goto snprintf_error; + + if (snprintf(networkAutostartDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) + goto snprintf_error; + if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) goto snprintf_error; } @@ -430,6 +444,7 @@ static struct qemud_server *qemudInitial roSockname[0] = '\0'; if (qemudInitPaths(sys, server->configDir, server->networkConfigDir, + server->autostartDir, server->networkAutostartDir, sockname, roSockname, PATH_MAX) < 0) goto cleanup; Index: libvirt/qemud/conf.h =================================================================== --- libvirt.orig/qemud/conf.h +++ libvirt/qemud/conf.h @@ -34,6 +34,7 @@ int qemudScanConfigs int qemudDeleteConfig (struct qemud_server *server, const char *configFile, const char *name); +int qemudEnsureDir (const char *path); void qemudFreeVMDef (struct qemud_vm_def *vm); void qemudFreeVM (struct qemud_vm *vm); --

1 0

[Libvir] [patch 6/9] Add autostart QEMU stubs
by Mark McLoughlin 22 Feb '07

22 Feb '07

Add the obvious parts of the QEMU implementation of the autostart API. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/dispatch.c =================================================================== --- libvirt.orig/qemud/dispatch.c +++ libvirt/qemud/dispatch.c @@ -717,6 +717,97 @@ static int qemudDispatchNetworkGetBridge return 0; } +static int qemudDispatchDomainGetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + int autostart; + + if (in->header.dataSize != sizeof(in->data.domainGetAutostartRequest)) + return -1; + + autostart = 0; + + ret = qemudDomainGetAutostart(server, + in->data.domainGetAutostartRequest.uuid, + &autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_DOMAIN_GET_AUTOSTART; + out->header.dataSize = sizeof(out->data.networkGetAutostartReply); + out->data.networkGetAutostartReply.autostart = (autostart != 0); + } + return 0; +} + +static int qemudDispatchDomainSetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + + if (in->header.dataSize != sizeof(in->data.domainSetAutostartRequest)) + return -1; + + ret = qemudDomainSetAutostart(server, + in->data.domainGetAutostartRequest.uuid, + in->data.domainSetAutostartRequest.autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_DOMAIN_SET_AUTOSTART; + out->header.dataSize = 0; + } + return 0; +} + +static int qemudDispatchNetworkGetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + int autostart; + + if (in->header.dataSize != sizeof(in->data.networkGetAutostartRequest)) + return -1; + + autostart = 0; + + ret = qemudNetworkGetAutostart(server, + in->data.networkGetAutostartRequest.uuid, + &autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_NETWORK_GET_AUTOSTART; + out->header.dataSize = sizeof(out->data.networkGetAutostartReply); + out->data.networkGetAutostartReply.autostart = (autostart != 0); + } + return 0; +} + +static int qemudDispatchNetworkSetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + + if (in->header.dataSize != sizeof(in->data.networkSetAutostartRequest)) + return -1; + + ret = qemudNetworkSetAutostart(server, + in->data.networkGetAutostartRequest.uuid, + in->data.networkSetAutostartRequest.autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_NETWORK_SET_AUTOSTART; + out->header.dataSize = 0; + } + return 0; +} typedef int (*clientFunc)(struct qemud_server *server, struct qemud_client *client, struct qemud_packet *in, struct qemud_packet *out); @@ -759,6 +850,10 @@ clientFunc funcsTransmitRW[QEMUD_PKT_MAX qemudDispatchNetworkDestroy, qemudDispatchNetworkDumpXML, qemudDispatchNetworkGetBridgeName, + qemudDispatchDomainGetAutostart, + qemudDispatchDomainSetAutostart, + qemudDispatchNetworkGetAutostart, + qemudDispatchNetworkSetAutostart, }; clientFunc funcsTransmitRO[QEMUD_PKT_MAX] = { @@ -796,6 +891,10 @@ clientFunc funcsTransmitRO[QEMUD_PKT_MAX NULL, qemudDispatchNetworkDumpXML, qemudDispatchNetworkGetBridgeName, + qemudDispatchDomainGetAutostart, + NULL, + qemudDispatchNetworkGetAutostart, + NULL, }; /* Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -509,6 +509,41 @@ int qemudDomainUndefine(struct qemud_ser return 0; } +int qemudDomainGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + return -1; + } + + *autostart = vm->autostart; + + return 0; +} + +int qemudDomainSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + return -1; + } + + autostart = (autostart != 0); + + if (vm->autostart == autostart) + return 0; + + vm->autostart = autostart; + + return 0; +} + struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = server->networks; @@ -685,6 +720,41 @@ int qemudNetworkGetBridgeName(struct qem return 0; } +int qemudNetworkGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + *autostart = network->autostart; + + return 0; +} + +int qemudNetworkSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + autostart = (autostart != 0); + + if (network->autostart == autostart) + return 0; + + network->autostart = autostart; + + return 0; +} + /* * Local variables: * indent-tabs-mode: nil Index: libvirt/qemud/driver.h =================================================================== --- libvirt.orig/qemud/driver.h +++ libvirt/qemud/driver.h @@ -85,6 +85,12 @@ struct qemud_vm *qemudDomainDefine(struc const char *xml); int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid); +int qemudDomainGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart); +int qemudDomainSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart); struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid); @@ -117,6 +123,12 @@ int qemudNetworkGetBridgeName(struct qem const unsigned char *uuid, char *ifname, int ifnamelen); +int qemudNetworkGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart); +int qemudNetworkSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart); #endif Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -209,6 +209,8 @@ struct qemud_vm { struct qemud_vm_def *def; /* The current definition */ struct qemud_vm_def *newDef; /* New definition to activate at shutdown */ + unsigned int autostart : 1; + struct qemud_vm *next; }; @@ -247,6 +249,7 @@ struct qemud_network { int dnsmasqPid; unsigned int active : 1; + unsigned int autostart : 1; struct qemud_network *next; }; Index: libvirt/qemud/protocol.h =================================================================== --- libvirt.orig/qemud/protocol.h +++ libvirt/qemud/protocol.h @@ -64,6 +64,10 @@ enum { QEMUD_PKT_NETWORK_DESTROY, QEMUD_PKT_NETWORK_DUMP_XML, QEMUD_PKT_NETWORK_GET_BRIDGE_NAME, + QEMUD_PKT_DOMAIN_GET_AUTOSTART, + QEMUD_PKT_DOMAIN_SET_AUTOSTART, + QEMUD_PKT_NETWORK_GET_AUTOSTART, + QEMUD_PKT_NETWORK_SET_AUTOSTART, QEMUD_PKT_MAX, } qemud_packet_type; @@ -279,6 +283,26 @@ union qemud_packet_data { struct { char ifname[QEMUD_MAX_IFNAME_LEN]; } networkGetBridgeNameReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + } domainGetAutostartRequest; + struct { + int autostart; + } domainGetAutostartReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + unsigned int autostart : 1; + } domainSetAutostartRequest; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + } networkGetAutostartRequest; + struct { + unsigned int autostart : 1; + } networkGetAutostartReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + unsigned int autostart : 1; + } networkSetAutostartRequest; }; /* Each packet has header & data */ Index: libvirt/src/qemu_internal.c =================================================================== --- libvirt.orig/src/qemu_internal.c +++ libvirt/src/qemu_internal.c @@ -806,6 +806,39 @@ static int qemuUndefine(virDomainPtr dom return ret; } +static int qemuDomainGetAutostart(virDomainPtr dom, + int *autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_DOMAIN_GET_AUTOSTART; + req.header.dataSize = sizeof(req.data.domainGetAutostartRequest); + memmove(req.data.domainGetAutostartRequest.uuid, dom->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(dom->conn, NULL, &req, &reply) < 0) { + return -1; + } + + *autostart = reply.data.domainGetAutostartReply.autostart; + + return 0; +} + +static int qemuDomainSetAutostart(virDomainPtr dom, + int autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_DOMAIN_SET_AUTOSTART; + req.header.dataSize = sizeof(req.data.domainSetAutostartRequest); + req.data.domainSetAutostartRequest.autostart = (autostart != 0); + memmove(req.data.domainSetAutostartRequest.uuid, dom->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(dom->conn, NULL, &req, &reply) < 0) { + return -1; + } + + return 0; +} + static int qemuNetworkOpen(virConnectPtr conn, const char *name, int flags) { @@ -1093,6 +1126,39 @@ static char * qemuNetworkGetBridgeName(v return strdup(reply.data.networkGetBridgeNameReply.ifname); } +static int qemuNetworkGetAutostart(virNetworkPtr network, + int *autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_NETWORK_GET_AUTOSTART; + req.header.dataSize = sizeof(req.data.networkGetAutostartRequest); + memmove(req.data.networkGetAutostartRequest.uuid, network->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(network->conn, NULL, &req, &reply) < 0) { + return -1; + } + + *autostart = reply.data.networkGetAutostartReply.autostart; + + return 0; +} + +static int qemuNetworkSetAutostart(virNetworkPtr network, + int autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_NETWORK_SET_AUTOSTART; + req.header.dataSize = sizeof(req.data.networkSetAutostartRequest); + req.data.networkSetAutostartRequest.autostart = (autostart != 0); + memmove(req.data.networkSetAutostartRequest.uuid, network->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(network->conn, NULL, &req, &reply) < 0) { + return -1; + } + + return 0; +} + static virDriver qemuDriver = { VIR_DRV_QEMU, "QEMU", @@ -1132,8 +1198,8 @@ static virDriver qemuDriver = { qemuUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ + qemuDomainGetAutostart, /* domainGetAutostart */ + qemuDomainSetAutostart, /* domainSetAutostart */ }; static virNetworkDriver qemuNetworkDriver = { @@ -1152,8 +1218,8 @@ static virNetworkDriver qemuNetworkDrive qemuNetworkDestroy, /* networkDestroy */ qemuNetworkDumpXML, /* networkDumpXML */ qemuNetworkGetBridgeName, /* networkGetBridgeName */ - NULL, /* networkGetAutostart */ - NULL, /* networkSetAutostart */ + qemuNetworkGetAutostart, /* networkGetAutostart */ + qemuNetworkSetAutostart, /* networkSetAutostart */ }; void qemuRegister(void) { --

1 0

[Libvir] [patch 5/9] Add autostart support to virsh
by Mark McLoughlin 22 Feb '07

22 Feb '07

Add "autostart" and "net-autostart" commands Also, cleanup the "list" and "net-list" commands a bit and add autostart info to them Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/virsh.c =================================================================== --- libvirt.orig/src/virsh.c +++ libvirt/src/virsh.c @@ -292,6 +292,51 @@ cmdHelp(vshControl * ctl, vshCmd * cmd) } /* + * "autostart" command + */ +static vshCmdInfo info_autostart[] = { + {"syntax", "autostart [--disable] <domain>"}, + {"help", gettext_noop("autostart a domain")}, + {"desc", + gettext_noop("Configure a domain to be automatically started at boot.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_autostart[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, + {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdAutostart(vshControl * ctl, vshCmd * cmd) +{ + virDomainPtr dom; + char *name; + int autostart; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + return FALSE; + + autostart = !vshCommandOptBool(cmd, "disable"); + + if (virDomainSetAutostart(dom, autostart) < 0) { + vshError(ctl, FALSE, _("Failed to %smark domain %s as autostarted"), + autostart ? "" : "un", name); + virDomainFree(dom); + return FALSE; + } + + vshPrint(ctl, _("Domain %s %smarked as autostarted\n"), + name, autostart ? "" : "un"); + + return TRUE; +} + +/* * "connect" command */ static vshCmdInfo info_connect[] = { @@ -473,53 +518,59 @@ cmdList(vshControl * ctl, vshCmd * cmd A qsort(&names[0], maxname, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%3s %-20s %s\n", _("Id"), _("Name"), _("State")); - vshPrintExtra(ctl, "----------------------------------\n"); + vshPrintExtra(ctl, "%3s %-20s %-10s %-10s\n", _("Id"), _("Name"), _("State"), _("Autostart")); + vshPrintExtra(ctl, "---------------------------------------------\n"); for (i = 0; i < maxid; i++) { - int ret; virDomainInfo info; virDomainPtr dom = virDomainLookupByID(ctl->conn, ids[i]); + const char *state, *autostartStr; + int autostart = 0; /* this kind of work with domains is not atomic operation */ if (!dom) continue; - ret = virDomainGetInfo(dom, &info); - vshPrint(ctl, "%3d %-20s %s\n", + if (virDomainGetInfo(dom, &info) < 0) + state = _("no state"); + else + state = _N(vshDomainStateToString(info.state)); + + if (virDomainGetAutostart(dom, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%3d %-20s %-10s %-10s\n", virDomainGetID(dom), virDomainGetName(dom), - ret < - 0 ? _("no state") : _N(vshDomainStateToString(info.state))); + state, + autostartStr); virDomainFree(dom); } for (i = 0; i < maxname; i++) { - int ret; - unsigned int id; virDomainInfo info; virDomainPtr dom = virDomainLookupByName(ctl->conn, names[i]); + const char *state, *autostartStr; + int autostart = 0; /* this kind of work with domains is not atomic operation */ if (!dom) { free(names[i]); continue; } - ret = virDomainGetInfo(dom, &info); - id = virDomainGetID(dom); - if (id == ((unsigned int)-1)) { - vshPrint(ctl, "%3s %-20s %s\n", - "-", - names[i], - ret < - 0 ? "no state" : vshDomainStateToString(info.state)); - } else { - vshPrint(ctl, "%3d %-20s %s\n", - id, - names[i], - ret < - 0 ? "no state" : vshDomainStateToString(info.state)); - } + if (virDomainGetInfo(dom, &info) < 0) + state = _("no state"); + else + state = _N(vshDomainStateToString(info.state)); + + if (virDomainGetAutostart(dom, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%3s %-20s %s %s\n", "-", names[i], state, autostartStr); virDomainFree(dom); free(names[i]); @@ -1632,6 +1683,50 @@ cmdDomuuid(vshControl * ctl, vshCmd * cm return TRUE; } +/* + * "net-autostart" command + */ +static vshCmdInfo info_network_autostart[] = { + {"syntax", "net-autostart [--disable] <network>"}, + {"help", gettext_noop("autostart a network")}, + {"desc", + gettext_noop("Configure a network to be automatically started at boot.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_autostart[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name or uuid")}, + {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkAutostart(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + char *name; + int autostart; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + return FALSE; + + autostart = !vshCommandOptBool(cmd, "disable"); + + if (virNetworkSetAutostart(network, autostart) < 0) { + vshError(ctl, FALSE, _("Failed to %smark network %s as autostarted"), + autostart ? "" : "un", name); + virNetworkFree(network); + return FALSE; + } + + vshPrint(ctl, _("Network %s %smarked as autostarted\n"), + name, autostart ? "" : "un"); + + return TRUE; +} /* * "net-create" command @@ -1895,11 +1990,13 @@ cmdNetworkList(vshControl * ctl, vshCmd qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%-20s\n", _("Name")); - vshPrintExtra(ctl, "----------------------------------\n"); + vshPrintExtra(ctl, "%-20s %-10s %-10s\n", _("Name"), _("State"), _("Autostart")); + vshPrintExtra(ctl, "-----------------------------------------\n"); for (i = 0; i < maxactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, activeNames[i]); + const char *autostartStr; + int autostart = 0; /* this kind of work with networks is not atomic operation */ if (!network) { @@ -1907,13 +2004,22 @@ cmdNetworkList(vshControl * ctl, vshCmd continue; } - vshPrint(ctl, "%-20s\n", - virNetworkGetName(network)); + if (virNetworkGetAutostart(network, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%-20s %-10s %-10s\n", + virNetworkGetName(network), + _("active"), + autostartStr); virNetworkFree(network); free(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); + const char *autostartStr; + int autostart = 0; /* this kind of work with networks is not atomic operation */ if (!network) { @@ -1921,8 +2027,15 @@ cmdNetworkList(vshControl * ctl, vshCmd continue; } - vshPrint(ctl, "%-20s\n", - inactiveNames[i]); + if (virNetworkGetAutostart(network, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%-20s %s %s\n", + inactiveNames[i], + _("inactive"), + autostartStr); virNetworkFree(network); free(inactiveNames[i]); @@ -2268,6 +2381,7 @@ cmdQuit(vshControl * ctl, vshCmd * cmd A * Commands */ static vshCmdDef commands[] = { + {"autostart", cmdAutostart, opts_autostart, info_autostart}, {"connect", cmdConnect, opts_connect, info_connect}, {"console", cmdConsole, opts_console, info_console}, {"create", cmdCreate, opts_create, info_create}, @@ -2282,6 +2396,7 @@ static vshCmdDef commands[] = { {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, {"help", cmdHelp, opts_help, info_help}, {"list", cmdList, opts_list, info_list}, + {"net-autostart", cmdNetworkAutostart, opts_network_autostart, info_network_autostart}, {"net-create", cmdNetworkCreate, opts_network_create, info_network_create}, {"net-define", cmdNetworkDefine, opts_network_define, info_network_define}, {"net-destroy", cmdNetworkDestroy, opts_network_destroy, info_network_destroy}, --

1 0

[Libvir] [patch 4/9] Add autostart API
by Mark McLoughlin 22 Feb '07

22 Feb '07

Add virDomainGetAutostart(), virDomainSetAutostart(), virNetworkGetAutostart() and virNetworkSetAutostart(). Add the methods to the drivers' vtables, but don't actually implement it anywhere. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/include/libvirt/libvirt.h.in =================================================================== --- libvirt.orig/include/libvirt/libvirt.h.in +++ libvirt/include/libvirt/libvirt.h.in @@ -328,6 +328,11 @@ int virConnectListDefinedDomains (virC int maxnames); int virDomainCreate (virDomainPtr domain); +int virDomainGetAutostart (virDomainPtr domain, + int *autostart); +int virDomainSetAutostart (virDomainPtr domain, + int autostart); + /** * virVcpuInfo: structure for information about a virtual CPU in a domain. */ @@ -528,6 +533,11 @@ char * virNetworkGetXMLDesc (virNetwor int flags); char * virNetworkGetBridgeName (virNetworkPtr network); +int virNetworkGetAutostart (virNetworkPtr network, + int *autostart); +int virNetworkSetAutostart (virNetworkPtr network, + int autostart); + #ifdef __cplusplus } #endif Index: libvirt/src/libvirt.c =================================================================== --- libvirt.orig/src/libvirt.c +++ libvirt/src/libvirt.c @@ -1862,6 +1862,69 @@ virDomainCreate(virDomainPtr domain) { } /** + * virDomainGetAutostart: + * @domain: a domain object + * + * Return a boolean value indicating whether the domain + * configured to be automatically started when the host + * machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virDomainGetAutostart(virDomainPtr domain, + int *autostart) { + int i; + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(domain, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return (-1); + } + if (!autostart) { + virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + for (i = 0;i < domain->conn->nb_drivers;i++) { + if ((domain->conn->drivers[i] != NULL) && + (domain->conn->drivers[i]->domainGetAutostart != NULL) && + (domain->conn->drivers[i]->domainGetAutostart(domain, autostart) == 0)) + return (0); + } + virLibConnError(domain->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** + * virDomainSetAutostart: + * @domain: a domain object + * + * Configure the domain to be automatically started + * when the host machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virDomainSetAutostart(virDomainPtr domain, + int autostart) { + int i; + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(domain, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return (-1); + } + + for (i = 0;i < domain->conn->nb_drivers;i++) { + if ((domain->conn->drivers[i] != NULL) && + (domain->conn->drivers[i]->domainSetAutostart != NULL) && + (domain->conn->drivers[i]->domainSetAutostart(domain, autostart) == 0)) + return (0); + } + virLibConnError(domain->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** * virDomainSetVcpus: * @domain: pointer to domain object, or NULL for Domain0 * @nvcpus: the new number of virtual CPUs for this domain @@ -2766,3 +2829,66 @@ virNetworkGetBridgeName(virNetworkPtr ne } return(ret); } + +/** + * virNetworkGetAutostart: + * @network: a network object + * + * Return a boolean value indicating whether the network + * configured to be automatically started when the host + * machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkGetAutostart(virNetworkPtr network, + int *autostart) { + int i; + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + if (!autostart) { + virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + for (i = 0;i < network->conn->nb_network_drivers;i++) { + if ((network->conn->networkDrivers[i] != NULL) && + (network->conn->networkDrivers[i]->networkGetAutostart != NULL) && + (network->conn->networkDrivers[i]->networkGetAutostart(network, autostart) == 0)) + return (0); + } + virLibConnError(network->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** + * virNetworkSetAutostart: + * @network: a network object + * + * Configure the network to be automatically started + * when the host machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkSetAutostart(virNetworkPtr network, + int autostart) { + int i; + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + + for (i = 0;i < network->conn->nb_network_drivers;i++) { + if ((network->conn->networkDrivers[i] != NULL) && + (network->conn->networkDrivers[i]->networkSetAutostart != NULL) && + (network->conn->networkDrivers[i]->networkSetAutostart(network, autostart) == 0)) + return (0); + } + virLibConnError(network->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} Index: libvirt/src/driver.h =================================================================== --- libvirt.orig/src/driver.h +++ libvirt/src/driver.h @@ -134,6 +134,12 @@ typedef int typedef int (*virDrvDomainDetachDevice) (virDomainPtr domain, char *xml); +typedef int + (*virDrvDomainGetAutostart) (virDomainPtr domain, + int *autostart); +typedef int + (*virDrvDomainSetAutostart) (virDomainPtr domain, + int autostart); typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -183,6 +189,8 @@ struct _virDriver { virDrvDomainUndefine domainUndefine; virDrvDomainAttachDevice domainAttachDevice; virDrvDomainDetachDevice domainDetachDevice; + virDrvDomainGetAutostart domainGetAutostart; + virDrvDomainSetAutostart domainSetAutostart; }; typedef int @@ -219,6 +227,13 @@ typedef char * int flags); typedef char * (*virDrvNetworkGetBridgeName) (virNetworkPtr network); +typedef int + (*virDrvNetworkGetAutostart) (virNetworkPtr network, + int *autostart); +typedef int + (*virDrvNetworkSetAutostart) (virNetworkPtr network, + int autostart); + typedef struct _virNetworkDriver virNetworkDriver; typedef virNetworkDriver *virNetworkDriverPtr; @@ -245,6 +260,8 @@ struct _virNetworkDriver { virDrvNetworkDestroy networkDestroy; virDrvNetworkDumpXML networkDumpXML; virDrvNetworkGetBridgeName networkGetBridgeName; + virDrvNetworkGetAutostart networkGetAutostart; + virDrvNetworkSetAutostart networkSetAutostart; }; Index: libvirt/src/proxy_internal.c =================================================================== --- libvirt.orig/src/proxy_internal.c +++ libvirt/src/proxy_internal.c @@ -81,6 +81,8 @@ static virDriver xenProxyDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/qemu_internal.c =================================================================== --- libvirt.orig/src/qemu_internal.c +++ libvirt/src/qemu_internal.c @@ -1132,6 +1132,8 @@ static virDriver qemuDriver = { qemuUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; static virNetworkDriver qemuNetworkDriver = { @@ -1150,6 +1152,8 @@ static virNetworkDriver qemuNetworkDrive qemuNetworkDestroy, /* networkDestroy */ qemuNetworkDumpXML, /* networkDumpXML */ qemuNetworkGetBridgeName, /* networkGetBridgeName */ + NULL, /* networkGetAutostart */ + NULL, /* networkSetAutostart */ }; void qemuRegister(void) { Index: libvirt/src/test.c =================================================================== --- libvirt.orig/src/test.c +++ libvirt/src/test.c @@ -125,6 +125,8 @@ static virDriver testDriver = { testDomainUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; typedef struct _testDev { Index: libvirt/src/xen_internal.c =================================================================== --- libvirt.orig/src/xen_internal.c +++ libvirt/src/xen_internal.c @@ -454,6 +454,8 @@ static virDriver xenHypervisorDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; #endif /* !PROXY */ Index: libvirt/src/xend_internal.c =================================================================== --- libvirt.orig/src/xend_internal.c +++ libvirt/src/xend_internal.c @@ -96,7 +96,9 @@ static virDriver xenDaemonDriver = { xenDaemonDomainDefineXML, /* domainDefineXML */ xenDaemonDomainUndefine, /* domainUndefine */ xenDaemonAttachDevice, /* domainAttachDevice */ - xenDaemonDetachDevice /* domainDetachDevice */ + xenDaemonDetachDevice, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/xm_internal.c =================================================================== --- libvirt.orig/src/xm_internal.c +++ libvirt/src/xm_internal.c @@ -104,6 +104,8 @@ static virDriver xenXMDriver = { xenXMDomainUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; static void Index: libvirt/src/xs_internal.c =================================================================== --- libvirt.orig/src/xs_internal.c +++ libvirt/src/xs_internal.c @@ -75,6 +75,8 @@ static virDriver xenStoreDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/libvirt_sym.version =================================================================== --- libvirt.orig/src/libvirt_sym.version +++ libvirt/src/libvirt_sym.version @@ -37,6 +37,8 @@ virConnectListDefinedDomains; virConnectNumOfDefinedDomains; virDomainUndefine; + virDomainGetAutostart; + virDomainSetAutostart; virGetVersion; virCopyLastError; virConnSetErrorFunc; @@ -76,6 +78,8 @@ virNetworkGetUUIDString; virNetworkGetXMLDesc; virNetworkGetBridgeName; + virNetworkGetAutostart; + virNetworkSetAutostart; local: *; }; --

1 0

[Libvir] [patch 3/9] Re-factor chunks of qemuds config handling
by Mark McLoughlin 22 Feb '07

22 Feb '07

The easiest way to explain where I'm coming from with this patch is to look at the current qemudLoadConfigXML(). It carries out three distinct operations - (a) parse the supplied XML, (b) assign the def to a VM (creating one if needed) and (c) save the XML. It's used in three places: 1) Loading at startup - you want (a) and (b), but you want to check whether the name matches the filename before doing (b) 2) Create() - you want (a) and (b) 3) Define() - you want (a), (b) and (c) So, mostly I'm just splitting the function into three and making the logic above much more obvious. It should also make some of the autostart code much more straightforward. There are a number of misc. improvements lurking in here too: - The couple of places where we remove a VM or network from the list is co-alesced into qemudRemoveInactiveVM() and qemudRemoveInactiveNetwork() - In qemudDomainCreate() and qemudNetworkCreate(), if starting the VM/network failed, we were leaving it on the list - The compareFileToNameSuffix() stuff - When loading config files at startup, we were failing to log any errors Signed-off-by: Mark McLoughlin <markmc(a)redhat.c> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1140,22 +1140,14 @@ int qemudBuildCommandLine(struct qemud_s /* Save a guest's config data into a persistent file */ static int qemudSaveConfig(struct qemud_server *server, - struct qemud_vm *vm) { + struct qemud_vm *vm, + struct qemud_vm_def *def) { char *xml; int fd = -1, ret = -1; int towrite; - int err; - if (!(xml = qemudGenerateXML(server, vm, 0))) { + if (!(xml = qemudGenerateXML(server, vm, def, 0))) return -1; - } - - if ((err = qemudEnsureDir(server->configDir))) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, - "cannot create config directory %s: %s", - server->configDir, strerror(err)); - goto cleanup; - } if ((fd = open(vm->configFile, O_WRONLY | O_CREAT | O_TRUNC, @@ -1192,31 +1184,33 @@ static int qemudSaveConfig(struct qemud_ return ret; } - -/* Create a qemud_vm instance, populating it based on the data - * in a libvirt XML document describing the guest */ -struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int save) { - struct qemud_vm_def *def = NULL; - struct qemud_vm *vm = NULL; +struct qemud_vm_def * +qemudParseVMDef(struct qemud_server *server, + const char *xmlStr, + const char *displayName) { xmlDocPtr xml; - int newVM = 0; + struct qemud_vm_def *def = NULL; - if (!(xml = xmlReadDoc(BAD_CAST doc, file ? file : "domain.xml", NULL, + if (!(xml = xmlReadDoc(BAD_CAST xmlStr, displayName ? displayName : "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { qemudReportError(server, VIR_ERR_XML_ERROR, NULL); return NULL; } - if (!(def = qemudParseXML(server, xml))) { - xmlFreeDoc(xml); - return NULL; - } + def = qemudParseXML(server, xml); + xmlFreeDoc(xml); + return def; +} + +struct qemud_vm * +qemudAssignVMDef(struct qemud_server *server, + struct qemud_vm_def *def) +{ + struct qemud_vm *vm = NULL; + if ((vm = qemudFindVMByName(server, def->name))) { if (!qemudIsActiveVM(vm)) { qemudFreeVMDef(vm->def); @@ -1226,63 +1220,87 @@ struct qemud_vm *qemudLoadConfigXML(stru qemudFreeVMDef(vm->newDef); vm->newDef = def; } - } else { - if (!(vm = calloc(1, sizeof(struct qemud_vm)))) { - qemudReportError(server, VIR_ERR_NO_MEMORY, "vm"); - qemudFreeVMDef(def); - return NULL; - } - - vm->stdout = -1; - vm->stderr = -1; - vm->monitor = -1; - vm->pid = -1; - vm->id = -1; - vm->def = def; - newVM = 1; - } - - if (file) { - strncpy(vm->configFile, file, PATH_MAX); - vm->configFile[PATH_MAX-1] = '\0'; - } else { - if (save) { - if (qemudMakeConfigPath(server->configDir, vm->def->name, ".xml", vm->configFile, PATH_MAX) < 0) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, - "cannot construct config file path"); - if (newVM) - qemudFreeVM(vm); - return NULL; - } - if (qemudSaveConfig(server, vm) < 0) { - if (newVM) - qemudFreeVM(vm); - return NULL; - } - } else { - vm->configFile[0] = '\0'; - } + return vm; } - if (newVM) { - vm->next = server->vms; - server->vms = vm; - server->ninactivevms++; + if (!(vm = calloc(1, sizeof(struct qemud_vm)))) { + qemudReportError(server, VIR_ERR_NO_MEMORY, "vm"); + return NULL; } + vm->stdout = -1; + vm->stderr = -1; + vm->monitor = -1; + vm->pid = -1; + vm->id = -1; + vm->def = def; + vm->next = server->vms; + + server->vms = vm; + server->ninactivevms++; + return vm; } +void +qemudRemoveInactiveVM(struct qemud_server *server, + struct qemud_vm *vm) +{ + struct qemud_vm *prev = NULL, *curr; + + curr = server->vms; + while (curr != vm) { + prev = curr; + curr = curr->next; + } + + if (curr) { + if (prev) + prev->next = curr->next; + else + server->vms = curr->next; + + server->ninactivevms--; + } + + qemudFreeVM(vm); +} + +int +qemudSaveVMDef(struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def) { + if (vm->configFile[0] == '\0') { + int err; + + if ((err = qemudEnsureDir(server->configDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create config directory %s: %s", + server->configDir, strerror(err)); + return -1; + } + + if (qemudMakeConfigPath(server->configDir, def->name, ".xml", + vm->configFile, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct config file path"); + return -1; + } + } + + return qemudSaveConfig(server, vm, def); +} static int qemudSaveNetworkConfig(struct qemud_server *server, - struct qemud_network *network) { + struct qemud_network *network, + struct qemud_network_def *def) { char *xml; int fd, ret = -1; int towrite; int err; - if (!(xml = qemudGenerateNetworkXML(server, network, 0))) { + if (!(xml = qemudGenerateNetworkXML(server, network, def))) { return -1; } @@ -1550,28 +1568,32 @@ static struct qemud_network_def *qemudPa return NULL; } -struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int save) { - struct qemud_network_def *def = NULL; - struct qemud_network *network = NULL; +struct qemud_network_def * +qemudParseNetworkDef(struct qemud_server *server, + const char *xmlStr, + const char *displayName) { xmlDocPtr xml; - int newNetwork = 0; + struct qemud_network_def *def; - if (!(xml = xmlReadDoc(BAD_CAST doc, file ? file : "network.xml", NULL, + if (!(xml = xmlReadDoc(BAD_CAST xmlStr, displayName ? displayName : "network.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { qemudReportError(server, VIR_ERR_XML_ERROR, NULL); return NULL; } - if (!(def = qemudParseNetworkXML(server, xml))) { - xmlFreeDoc(xml); - return NULL; - } + def = qemudParseNetworkXML(server, xml); + xmlFreeDoc(xml); + return def; +} + +struct qemud_network * +qemudAssignNetworkDef(struct qemud_server *server, + struct qemud_network_def *def) { + struct qemud_network *network; + if ((network = qemudFindNetworkByName(server, def->name))) { if (!qemudIsActiveNetwork(network)) { qemudFreeNetworkDef(network->def); @@ -1581,87 +1603,203 @@ struct qemud_network *qemudLoadNetworkCo qemudFreeNetworkDef(network->newDef); network->newDef = def; } - } else { - if (!(network = calloc(1, sizeof(struct qemud_network)))) { - qemudReportError(server, VIR_ERR_NO_MEMORY, "network"); - return NULL; - } - network->def = def; - newNetwork = 1; + return network; } - if (file) { - strncpy(network->configFile, file, PATH_MAX); - network->configFile[PATH_MAX-1] = '\0'; - } else { - if (save) { - if (qemudMakeConfigPath(server->networkConfigDir, network->def->name, ".xml", network->configFile, PATH_MAX) < 0) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); - if (newNetwork) - qemudFreeNetwork(network); - return NULL; - } + if (!(network = calloc(1, sizeof(struct qemud_network)))) { + qemudReportError(server, VIR_ERR_NO_MEMORY, "network"); + return NULL; + } - if (qemudSaveNetworkConfig(server, network) < 0) { - if (newNetwork) - qemudFreeNetwork(network); - return NULL; - } - } else { - network->configFile[0] = '\0'; - } + network->def = def; + network->next = server->networks; + + server->networks = network; + server->ninactivenetworks++; + + return network; +} + +void +qemudRemoveInactiveNetwork(struct qemud_server *server, + struct qemud_network *network) +{ + struct qemud_network *prev = NULL, *curr; + + curr = server->networks; + while (curr != network) { + prev = curr; + curr = curr->next; } - if (newNetwork) { - network->next = server->networks; - server->networks = network; - server->ninactivenetworks++; + if (curr) { + if (prev) + prev->next = curr->next; + else + server->networks = curr->next; + + server->ninactivenetworks--; } - return network; + qemudFreeNetwork(network); } +int +qemudSaveNetworkDef(struct qemud_server *server, + struct qemud_network *network, + struct qemud_network_def *def) { + + if (network->configFile[0] == '\0') { + int err; + + if ((err = qemudEnsureDir(server->networkConfigDir))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot create config directory %s: %s", + server->networkConfigDir, strerror(err)); + return -1; + } + + if (qemudMakeConfigPath(server->networkConfigDir, def->name, ".xml", + network->configFile, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot construct config file path"); + return -1; + } + } + + return qemudSaveNetworkConfig(server, network, def); +} -/* Load a guest from its persistent config file */ -static void qemudLoadConfig(struct qemud_server *server, - const char *file, - int isGuest) { +static int +qemudReadFile(const char *path, + char *buf, + int maxlen) { FILE *fh; struct stat st; - char xml[QEMUD_MAX_XML_LEN]; - int ret; + int ret = 0; - if (!(fh = fopen(file, "r"))) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot open config file %s", file); - return; + if (!(fh = fopen(path, "r"))) { + qemudLog(QEMUD_WARN, "Failed to open file '%s': %s", + path, strerror(errno)); + goto error; } if (fstat(fileno(fh), &st) < 0) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot stat config file %s", file); - goto cleanup; + qemudLog(QEMUD_WARN, "Failed to stat file '%s': %s", + path, strerror(errno)); + goto error; } - if (st.st_size >= QEMUD_MAX_XML_LEN) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "config too large in file %s", file); - goto cleanup; + if (S_ISDIR(st.st_mode)) { + qemudLog(QEMUD_DEBUG, "Ignoring directory '%s' - clearly not a config file", + path); + goto error; } - if ((ret = fread(xml, st.st_size, 1, fh)) != 1) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot read config file %s", file); - goto cleanup; + if (st.st_size >= maxlen) { + qemudLog(QEMUD_WARN, "File '%s' is too large", path); + goto error; } - xml[st.st_size] = '\0'; - if (isGuest) { - qemudLoadConfigXML(server, file, xml, 1); - } else { - qemudLoadNetworkConfigXML(server, file, xml, 1); + if ((ret = fread(buf, st.st_size, 1, fh)) != 1) { + qemudLog(QEMUD_WARN, "Failed to read config file '%s': %s", + path, strerror(errno)); + goto error; } - cleanup: - fclose(fh); + + buf[st.st_size] = '\0'; + + ret = 1; + + error: + if (fh) + fclose(fh); + + return ret; } +static int +compareFileToNameSuffix(const char *file, + const char *name, + const char *suffix) { + int filelen = strlen(file); + int namelen = strlen(name); + int suffixlen = strlen(suffix); + + if (filelen == (namelen + suffixlen) && + !strncmp(file, name, namelen) && + !strncmp(file + namelen, suffix, suffixlen)) + return 1; + else + return 0; +} + +static struct qemud_vm * +qemudLoadConfig(struct qemud_server *server, + const char *file, + const char *path, + const char *xml) { + struct qemud_vm_def *def; + struct qemud_vm *vm; + + if (!(def = qemudParseVMDef(server, xml, file))) { + qemudLog(QEMUD_WARN, "Error parsing QEMU guest config '%s' : %s", + path, server->errorMessage); + return NULL; + } + + if (!compareFileToNameSuffix(file, def->name, ".xml")) { + qemudLog(QEMUD_WARN, "QEMU guest config filename '%s' does not match guest name '%s'", + path, def->name); + qemudFreeVMDef(def); + return NULL; + } + + if (!(vm = qemudAssignVMDef(server, def))) { + qemudLog(QEMUD_WARN, "Failed to load QEMU guest config '%s': out of memory", path); + qemudFreeVMDef(def); + return NULL; + } + + strncpy(vm->configFile, path, PATH_MAX); + vm->configFile[PATH_MAX-1] = '\0'; + + return vm; +} + +static struct qemud_network * +qemudLoadNetworkConfig(struct qemud_server *server, + const char *file, + const char *path, + const char *xml) { + struct qemud_network_def *def; + struct qemud_network *network; + + if (!(def = qemudParseNetworkDef(server, xml, file))) { + qemudLog(QEMUD_WARN, "Error parsing network config '%s' : %s", + path, server->errorMessage); + return NULL; + } + + if (!compareFileToNameSuffix(file, def->name, ".xml")) { + qemudLog(QEMUD_WARN, "Network config filename '%s' does not match network name '%s'", + path, def->name); + qemudFreeNetworkDef(def); + return NULL; + } + + if (!(network = qemudAssignNetworkDef(server, def))) { + qemudLog(QEMUD_WARN, "Failed to load network config '%s': out of memory", path); + qemudFreeNetworkDef(def); + return NULL; + } + + strncpy(network->configFile, path, PATH_MAX); + network->configFile[PATH_MAX-1] = '\0'; + + return network; +} static int qemudScanConfigDir(struct qemud_server *server, @@ -1679,14 +1817,25 @@ int qemudScanConfigDir(struct qemud_serv } while ((entry = readdir(dir))) { - char file[PATH_MAX]; + char xml[QEMUD_MAX_XML_LEN]; + char path[PATH_MAX]; + if (entry->d_name[0] == '.') continue; - if (qemudMakeConfigPath(configDir, entry->d_name, NULL, file, PATH_MAX) < 0) + if (qemudMakeConfigPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { + qemudLog(QEMUD_WARN, "Config filename '%s/%s' is too long", + configDir, entry->d_name); + continue; + } + + if (!qemudReadFile(path, xml, QEMUD_MAX_XML_LEN)) continue; - qemudLoadConfig(server, file, isGuest); + if (isGuest) + qemudLoadConfig(server, entry->d_name, path, xml); + else + qemudLoadNetworkConfig(server, entry->d_name, path, xml); } closedir(dir); @@ -1751,8 +1900,10 @@ int qemudBufferPrintf(struct qemudBuffer } /* Generate an XML document describing the guest's configuration */ -char *qemudGenerateXML(struct qemud_server *server, struct qemud_vm *vm, int live) { - struct qemud_vm_def *def = live ? vm->def : (vm->newDef ? vm->newDef : vm->def); +char *qemudGenerateXML(struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def, + int live) { struct qemudBuffer buf; unsigned char *uuid; struct qemud_vm_disk_def *disk; @@ -1986,9 +2137,8 @@ char *qemudGenerateXML(struct qemud_serv char *qemudGenerateNetworkXML(struct qemud_server *server, - struct qemud_network *network, - int live) { - struct qemud_network_def *def = live ? network->def : (network->newDef ? network->newDef : network->def); + struct qemud_network *network ATTRIBUTE_UNUSED, + struct qemud_network_def *def) { struct qemudBuffer buf; unsigned char *uuid; Index: libvirt/qemud/conf.h =================================================================== --- libvirt.orig/qemud/conf.h +++ libvirt/qemud/conf.h @@ -26,33 +26,55 @@ #include "internal.h" -int qemudBuildCommandLine(struct qemud_server *server, - struct qemud_vm *vm, - char ***argv); - -int qemudScanConfigs(struct qemud_server *server); -int qemudDeleteConfig(struct qemud_server *server, - const char *configFile, - const char *name); - -void qemudFreeVMDef(struct qemud_vm_def *vm); -void qemudFreeVM(struct qemud_vm *vm); -struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int persist); -char *qemudGenerateXML(struct qemud_server *server, - struct qemud_vm *vm, int live); - -void qemudFreeNetworkDef(struct qemud_network_def *def); -void qemudFreeNetwork(struct qemud_network *network); -struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, - const char *file, - const char *doc, - int persist); -char *qemudGenerateNetworkXML(struct qemud_server *server, - struct qemud_network *network, - int live); +int qemudBuildCommandLine (struct qemud_server *server, + struct qemud_vm *vm, + char ***argv); + +int qemudScanConfigs (struct qemud_server *server); +int qemudDeleteConfig (struct qemud_server *server, + const char *configFile, + const char *name); + +void qemudFreeVMDef (struct qemud_vm_def *vm); +void qemudFreeVM (struct qemud_vm *vm); + +struct qemud_vm * + qemudAssignVMDef (struct qemud_server *server, + struct qemud_vm_def *def); +void qemudRemoveInactiveVM (struct qemud_server *server, + struct qemud_vm *vm); + +struct qemud_vm_def * + qemudParseVMDef (struct qemud_server *server, + const char *xmlStr, + const char *displayName); +int qemudSaveVMDef (struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def); +char * qemudGenerateXML (struct qemud_server *server, + struct qemud_vm *vm, + struct qemud_vm_def *def, + int live); + +void qemudFreeNetworkDef (struct qemud_network_def *def); +void qemudFreeNetwork (struct qemud_network *network); + +struct qemud_network * + qemudAssignNetworkDef (struct qemud_server *server, + struct qemud_network_def *def); +void qemudRemoveInactiveNetwork (struct qemud_server *server, + struct qemud_network *network); + +struct qemud_network_def * + qemudParseNetworkDef (struct qemud_server *server, + const char *xmlStr, + const char *displayName); +int qemudSaveNetworkDef (struct qemud_server *server, + struct qemud_network *network, + struct qemud_network_def *def); +char * qemudGenerateNetworkXML (struct qemud_server *server, + struct qemud_network *network, + struct qemud_network_def *def); #endif Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -279,14 +279,20 @@ int qemudNumDomains(struct qemud_server return server->nactivevms; } struct qemud_vm *qemudDomainCreate(struct qemud_server *server, const char *xml) { + + struct qemud_vm_def *def; struct qemud_vm *vm; - if (!(vm = qemudLoadConfigXML(server, NULL, xml, 0))) { + if (!(def = qemudParseVMDef(server, xml, NULL))) + return NULL; + + if (!(vm = qemudAssignVMDef(server, def))) { + qemudFreeVMDef(def); return NULL; } if (qemudStartVMDaemon(server, vm) < 0) { - qemudFreeVM(vm); + qemudRemoveInactiveVM(server, vm); return NULL; } @@ -416,7 +422,7 @@ int qemudDomainDumpXML(struct qemud_serv return -1; } - vmxml = qemudGenerateXML(server, vm, 1); + vmxml = qemudGenerateXML(server, vm, vm->def, 1); if (!vmxml) return -1; @@ -461,12 +467,27 @@ struct qemud_vm *qemudDomainStart(struct struct qemud_vm *qemudDomainDefine(struct qemud_server *server, const char *xml) { - return qemudLoadConfigXML(server, NULL, xml, 1); + struct qemud_vm_def *def; + struct qemud_vm *vm; + + if (!(def = qemudParseVMDef(server, xml, NULL))) + return NULL; + + if (!(vm = qemudAssignVMDef(server, def))) { + qemudFreeVMDef(def); + return NULL; + } + + if (qemudSaveVMDef(server, vm, def) < 0) { + qemudRemoveInactiveVM(server, vm); + return NULL; + } + + return vm; } int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); - struct qemud_vm *prev = NULL, *curr = server->vms; if (!vm) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); @@ -483,22 +504,7 @@ int qemudDomainUndefine(struct qemud_ser vm->configFile[0] = '\0'; - while (curr) { - if (curr == vm) { - if (prev) { - prev->next = curr->next; - } else { - server->vms = curr->next; - } - server->ninactivevms--; - break; - } - - prev = curr; - curr = curr->next; - } - - qemudFreeVM(vm); + qemudRemoveInactiveVM(server, vm); return 0; } @@ -566,14 +572,19 @@ int qemudListDefinedNetworks(struct qemu } struct qemud_network *qemudNetworkCreate(struct qemud_server *server, const char *xml) { + struct qemud_network_def *def; struct qemud_network *network; - if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 0))) { + if (!(def = qemudParseNetworkDef(server, xml, NULL))) + return NULL; + + if (!(network = qemudAssignNetworkDef(server, def))) { + qemudFreeNetworkDef(def); return NULL; } if (qemudStartNetworkDaemon(server, network) < 0) { - qemudFreeNetwork(network); + qemudRemoveInactiveNetwork(server, network); return NULL; } @@ -581,12 +592,27 @@ struct qemud_network *qemudNetworkCreate } struct qemud_network *qemudNetworkDefine(struct qemud_server *server, const char *xml) { - return qemudLoadNetworkConfigXML(server, NULL, xml, 1); + struct qemud_network_def *def; + struct qemud_network *network; + + if (!(def = qemudParseNetworkDef(server, xml, NULL))) + return NULL; + + if (!(network = qemudAssignNetworkDef(server, def))) { + qemudFreeNetworkDef(def); + return NULL; + } + + if (qemudSaveNetworkDef(server, network, def) < 0) { + qemudRemoveInactiveNetwork(server, network); + return NULL; + } + + return network; } int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); - struct qemud_network *prev = NULL, *curr = server->networks; if (!network) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no network with matching uuid"); @@ -598,22 +624,7 @@ int qemudNetworkUndefine(struct qemud_se network->configFile[0] = '\0'; - while (curr) { - if (curr == network) { - if (prev) { - prev->next = curr->next; - } else { - server->networks = curr->next; - } - server->ninactivenetworks--; - break; - } - - prev = curr; - curr = curr->next; - } - - qemudFreeNetwork(network); + qemudRemoveInactiveNetwork(server, network); return 0; } @@ -650,7 +661,7 @@ int qemudNetworkDumpXML(struct qemud_ser return -1; } - networkxml = qemudGenerateNetworkXML(server, network, 1); + networkxml = qemudGenerateNetworkXML(server, network, network->def); if (!networkxml) return -1; Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -1255,8 +1255,7 @@ static int qemudDispatchPoll(struct qemu struct qemud_socket *sock = server->sockets; struct qemud_client *client = server->clients; struct qemud_vm *vm; - struct qemud_vm *tmp; - struct qemud_network *network, *prevnet; + struct qemud_network *network; int ret = 0; int fd = 0; @@ -1336,42 +1335,24 @@ static int qemudDispatchPoll(struct qemu /* Cleanup any VMs which shutdown & dont have an associated config file */ vm = server->vms; - tmp = NULL; while (vm) { - if (!qemudIsActiveVM(vm) && !vm->configFile[0]) { - struct qemud_vm *next = vm->next; - if (tmp) { - tmp->next = next; - } else { - server->vms = next; - } - qemudFreeVM(vm); - server->ninactivevms--; - vm = next; - } else { - tmp = vm; - vm = vm->next; - } + struct qemud_vm *next = vm->next; + + if (!qemudIsActiveVM(vm) && !vm->configFile[0]) + qemudRemoveInactiveVM(server, vm); + + vm = next; } /* Cleanup any networks too */ network = server->networks; - prevnet = NULL; while (network) { - if (!qemudIsActiveNetwork(network) && !network->configFile[0]) { - struct qemud_network *next = network->next; - if (prevnet) { - prevnet->next = next; - } else { - server->networks = next; - } - qemudFreeNetwork(network); - server->ninactivenetworks--; - network = next; - } else { - prevnet = network; - network = network->next; - } + struct qemud_network *next = network->next; + + if (!qemudIsActiveNetwork(network) && !network->configFile[0]) + qemudRemoveInactiveNetwork(server, network); + + network = next; } return ret; --

1 0

[Libvir] [patch 2/9] Make Start() return an error message if uuid wasnt found
by Mark McLoughlin 22 Feb '07

22 Feb '07

qemudDispatchDomainStart() doesn't report an error if the uuid lookup fails. The patch not only fixes that, but also moves the uuid lookup into the driver so that it matches the way we do Destroy(). Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -285,7 +285,7 @@ struct qemud_vm *qemudDomainCreate(struc return NULL; } - if (qemudDomainStart(server, vm) < 0) { + if (qemudStartVMDaemon(server, vm) < 0) { qemudFreeVM(vm); return NULL; } @@ -339,13 +339,14 @@ int qemudDomainResume(struct qemud_serve int qemudDomainDestroy(struct qemud_server *server, int id) { struct qemud_vm *vm = qemudFindVMByID(server, id); + if (!vm) { - qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, + "no domain with matching id %d", id); return -1; } - if (qemudShutdownVMDaemon(server, vm) < 0) - return -1; - return 0; + + return qemudShutdownVMDaemon(server, vm); } @@ -446,8 +447,16 @@ int qemudNumDefinedDomains(struct qemud_ } -int qemudDomainStart(struct qemud_server *server, struct qemud_vm *vm) { - return qemudStartVMDaemon(server, vm); +struct qemud_vm *qemudDomainStart(struct qemud_server *server, const unsigned char *uuid) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid"); + return NULL; + } + + return qemudStartVMDaemon(server, vm) < 0 ? NULL : vm; } @@ -563,7 +572,7 @@ struct qemud_network *qemudNetworkCreate return NULL; } - if (qemudNetworkStart(server, network) < 0) { + if (qemudStartNetworkDaemon(server, network) < 0) { qemudFreeNetwork(network); return NULL; } @@ -609,21 +618,28 @@ int qemudNetworkUndefine(struct qemud_se return 0; } -int qemudNetworkStart(struct qemud_server *server, struct qemud_network *network) { - return qemudStartNetworkDaemon(server, network); +struct qemud_network *qemudNetworkStart(struct qemud_server *server, const unsigned char *uuid) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, + "no network with matching uuid"); + return NULL; + } + + return qemudStartNetworkDaemon(server, network) < 0 ? NULL : network; } int qemudNetworkDestroy(struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + if (!network) { - qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + qemudReportError(server, VIR_ERR_INVALID_NETWORK, + "no network with matching uuid"); return -1; } - if (qemudShutdownNetworkDaemon(server, network) < 0) - return -1; - - return 0; + return qemudShutdownNetworkDaemon(server, network); } int qemudNetworkDumpXML(struct qemud_server *server, const unsigned char *uuid, char *xml, int xmllen) { Index: libvirt/qemud/driver.h =================================================================== --- libvirt.orig/qemud/driver.h +++ libvirt/qemud/driver.h @@ -79,8 +79,8 @@ int qemudListDefinedDomains(struct qemud char *const*names, int nnames); int qemudNumDefinedDomains(struct qemud_server *server); -int qemudDomainStart(struct qemud_server *server, - struct qemud_vm *vm); +struct qemud_vm *qemudDomainStart(struct qemud_server *server, + const unsigned char *uuid); struct qemud_vm *qemudDomainDefine(struct qemud_server *server, const char *xml); int qemudDomainUndefine(struct qemud_server *server, @@ -103,10 +103,10 @@ struct qemud_network *qemudNetworkCreate const char *xml); struct qemud_network *qemudNetworkDefine(struct qemud_server *server, const char *xml); +struct qemud_network *qemudNetworkStart(struct qemud_server *server, + const unsigned char *uuid); int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid); -int qemudNetworkStart(struct qemud_server *server, - struct qemud_network *network); int qemudNetworkDestroy(struct qemud_server *server, const unsigned char *uuid); int qemudNetworkDumpXML(struct qemud_server *server, Index: libvirt/qemud/dispatch.c =================================================================== --- libvirt.orig/qemud/dispatch.c +++ libvirt/qemud/dispatch.c @@ -257,8 +257,7 @@ static int qemudDispatchDomainDestroy(st if (in->header.dataSize != sizeof(in->data.domainDestroyRequest)) return -1; - int ret = qemudDomainDestroy(server, in->data.domainDestroyRequest.id); - if (ret < 0) { + if (qemudDomainDestroy(server, in->data.domainDestroyRequest.id) < 0) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { @@ -410,11 +409,12 @@ static int qemudDispatchNumDefinedDomain static int qemudDispatchDomainStart(struct qemud_server *server, struct qemud_client *client, struct qemud_packet *in, struct qemud_packet *out) { + struct qemud_vm *vm; + if (in->header.dataSize != sizeof(in->data.domainStartRequest)) return -1; - struct qemud_vm *vm = qemudFindVMByUUID(server, in->data.domainStartRequest.uuid); - if (!vm || qemudDomainStart(server, vm) < 0) { + if (!(vm = qemudDomainStart(server, in->data.domainStartRequest.uuid))) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { @@ -651,11 +651,12 @@ static int qemudDispatchNetworkUndefine( static int qemudDispatchNetworkStart(struct qemud_server *server, struct qemud_client *client, struct qemud_packet *in, struct qemud_packet *out) { + struct qemud_network *network; + if (in->header.dataSize != sizeof(in->data.networkStartRequest)) return -1; - struct qemud_network *network = qemudFindNetworkByUUID(server, in->data.networkStartRequest.uuid); - if (!network || qemudNetworkStart(server, network) < 0) { + if (!(network = qemudNetworkStart(server, in->data.networkStartRequest.uuid))) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { @@ -670,8 +671,7 @@ static int qemudDispatchNetworkDestroy(s if (in->header.dataSize != sizeof(in->data.networkDestroyRequest)) return -1; - int ret = qemudNetworkDestroy(server, in->data.networkDestroyRequest.uuid); - if (ret < 0) { + if (qemudNetworkDestroy(server, in->data.networkDestroyRequest.uuid) < 0) { if (qemudDispatchFailure(server, client, out) < 0) return -1; } else { --

1 0

[Libvir] [patch 1/9] Merge the active and inactive network/guest lists
by Mark McLoughlin 22 Feb '07

22 Feb '07

Merge the ->activevms and ->inactivevms into a single ->vms list where each VM has a "active" flag in order to make things easier to manage. Likewise for networks. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1215,7 +1215,7 @@ struct qemud_vm *qemudLoadConfigXML(stru xmlFreeDoc(xml); if ((vm = qemudFindVMByName(server, def->name))) { - if (vm->id == -1) { + if (!qemudIsActiveVM(vm)) { qemudFreeVMDef(vm->def); vm->def = def; } else { @@ -1263,8 +1263,8 @@ struct qemud_vm *qemudLoadConfigXML(stru } if (newVM) { - vm->next = server->inactivevms; - server->inactivevms = vm; + vm->next = server->vms; + server->vms = vm; server->ninactivevms++; } @@ -1570,7 +1570,7 @@ struct qemud_network *qemudLoadNetworkCo xmlFreeDoc(xml); if ((network = qemudFindNetworkByName(server, def->name))) { - if (!network->active) { + if (!qemudIsActiveNetwork(network)) { qemudFreeNetworkDef(network->def); network->def = def; } else { @@ -1611,8 +1611,8 @@ struct qemud_network *qemudLoadNetworkCo } if (newNetwork) { - network->next = server->inactivenetworks; - server->inactivenetworks = network; + network->next = server->networks; + server->networks = network; server->ninactivenetworks++; } @@ -1777,7 +1777,7 @@ char *qemudGenerateXML(struct qemud_serv goto cleanup; } - if (vm->id >= 0 && live) { + if (qemudIsActiveVM(vm) && live) { if (qemudBufferPrintf(&buf, "<domain type='%s' id='%d'>\n", type, vm->id) < 0) goto no_memory; } else { @@ -1945,7 +1945,7 @@ char *qemudGenerateXML(struct qemud_serv if (def->vncPort && qemudBufferPrintf(&buf, " port='%d'", - vm->id >= 0 && live ? def->vncActivePort : def->vncPort) < 0) + qemudIsActiveVM(vm) && live ? def->vncActivePort : def->vncPort) < 0) goto no_memory; if (qemudBufferAdd(&buf, "/>\n") < 0) Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -222,10 +222,10 @@ static int qemudGetProcessInfo(unsigned } struct qemud_vm *qemudFindVMByID(const struct qemud_server *server, int id) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { - if (vm->id == id) + if (qemudIsActiveVM(vm) && vm->id == id) return vm; vm = vm->next; } @@ -235,7 +235,7 @@ struct qemud_vm *qemudFindVMByID(const s struct qemud_vm *qemudFindVMByUUID(const struct qemud_server *server, const unsigned char *uuid) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { if (!memcmp(vm->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) @@ -243,19 +243,12 @@ struct qemud_vm *qemudFindVMByUUID(const vm = vm->next; } - vm = server->inactivevms; - while (vm) { - if (!memcmp(vm->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) - return vm; - vm = vm->next; - } - return NULL; } struct qemud_vm *qemudFindVMByName(const struct qemud_server *server, const char *name) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { if (!strcmp(vm->def->name, name)) @@ -263,13 +256,6 @@ struct qemud_vm *qemudFindVMByName(const vm = vm->next; } - vm = server->inactivevms; - while (vm) { - if (!strcmp(vm->def->name, name)) - return vm; - vm = vm->next; - } - return NULL; } @@ -278,12 +264,14 @@ int qemudGetVersion(struct qemud_server } int qemudListDomains(struct qemud_server *server, int *ids, int nids) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; int got = 0; while (vm && got < nids) { - ids[got] = vm->id; + if (qemudIsActiveVM(vm)) { + ids[got] = vm->id; + got++; + } vm = vm->next; - got++; } return got; } @@ -313,7 +301,7 @@ int qemudDomainSuspend(struct qemud_serv qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); return -1; } @@ -335,7 +323,7 @@ int qemudDomainResume(struct qemud_serve qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); return -1; } @@ -355,11 +343,6 @@ int qemudDomainDestroy(struct qemud_serv qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { - qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); - return -1; - } - if (qemudShutdownVMDaemon(server, vm) < 0) return -1; return 0; @@ -378,14 +361,14 @@ int qemudDomainGetInfo(struct qemud_serv return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { *runstate = QEMUD_STATE_STOPPED; } else { /* XXX in future need to add PAUSED */ *runstate = QEMUD_STATE_RUNNING; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { *cputime = 0; } else { if (qemudGetProcessInfo(cputime, vm->pid) < 0) { @@ -408,7 +391,7 @@ int qemudDomainSave(struct qemud_server qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching id %d", id); return -1; } - if (vm->pid == -1) { + if (!qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_OPERATION_FAILED, "domain is not running"); return -1; } @@ -444,13 +427,15 @@ int qemudDomainDumpXML(struct qemud_serv int qemudListDefinedDomains(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_vm *vm = server->inactivevms; + struct qemud_vm *vm = server->vms; int got = 0; while (vm && got < nnames) { - strncpy(names[got], vm->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (!qemudIsActiveVM(vm)) { + strncpy(names[got], vm->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } vm = vm->next; - got++; } return got; } @@ -462,30 +447,7 @@ int qemudNumDefinedDomains(struct qemud_ int qemudDomainStart(struct qemud_server *server, struct qemud_vm *vm) { - struct qemud_vm *prev = NULL, *curr = server->inactivevms; - if (qemudStartVMDaemon(server, vm) < 0) { - return 1; - } - - while (curr) { - if (curr == vm) { - if (prev) - prev->next = curr->next; - else - server->inactivevms = curr->next; - server->ninactivevms--; - break; - } - prev = curr; - curr = curr->next; - } - - vm->next = server->activevms; - server->activevms = vm; - server->nactivevms++; - server->nvmfds += 2; - - return 0; + return qemudStartVMDaemon(server, vm); } @@ -495,14 +457,14 @@ struct qemud_vm *qemudDomainDefine(struc int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); - struct qemud_vm *prev = NULL, *curr = server->inactivevms; + struct qemud_vm *prev = NULL, *curr = server->vms; if (!vm) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); return -1; } - if (vm->pid != -1) { + if (qemudIsActiveVM(vm)) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot delete active domain"); return -1; } @@ -517,7 +479,7 @@ int qemudDomainUndefine(struct qemud_ser if (prev) { prev->next = curr->next; } else { - server->inactivevms = curr->next; + server->vms = curr->next; } server->ninactivevms--; break; @@ -534,15 +496,8 @@ int qemudDomainUndefine(struct qemud_ser struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid) { - struct qemud_network *network = server->activenetworks; - - while (network) { - if (!memcmp(network->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) - return network; - network = network->next; - } + struct qemud_network *network = server->networks; - network = server->inactivenetworks; while (network) { if (!memcmp(network->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) return network; @@ -554,7 +509,7 @@ struct qemud_network *qemudFindNetworkBy struct qemud_network *qemudFindNetworkByName(const struct qemud_server *server, const char *name) { - struct qemud_network *network = server->activenetworks; + struct qemud_network *network = server->networks; while (network) { if (!strcmp(network->def->name, name)) @@ -562,13 +517,6 @@ struct qemud_network *qemudFindNetworkBy network = network->next; } - network = server->inactivenetworks; - while (network) { - if (!strcmp(network->def->name, name)) - return network; - network = network->next; - } - return NULL; } @@ -577,13 +525,15 @@ int qemudNumNetworks(struct qemud_server } int qemudListNetworks(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_network *network = server->activenetworks; + struct qemud_network *network = server->networks; int got = 0; while (network && got < nnames) { - strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (qemudIsActiveNetwork(network)) { + strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } network = network->next; - got++; } return got; } @@ -593,13 +543,15 @@ int qemudNumDefinedNetworks(struct qemud } int qemudListDefinedNetworks(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_network *network = server->inactivenetworks; + struct qemud_network *network = server->networks; int got = 0; while (network && got < nnames) { - strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (!qemudIsActiveNetwork(network)) { + strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } network = network->next; - got++; } return got; } @@ -625,7 +577,7 @@ struct qemud_network *qemudNetworkDefine int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); - struct qemud_network *prev = NULL, *curr = server->inactivenetworks; + struct qemud_network *prev = NULL, *curr = server->networks; if (!network) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no network with matching uuid"); @@ -642,7 +594,7 @@ int qemudNetworkUndefine(struct qemud_se if (prev) { prev->next = curr->next; } else { - server->inactivenetworks = curr->next; + server->networks = curr->next; } server->ninactivenetworks--; break; @@ -658,29 +610,7 @@ int qemudNetworkUndefine(struct qemud_se } int qemudNetworkStart(struct qemud_server *server, struct qemud_network *network) { - struct qemud_network *prev = NULL, *curr = server->inactivenetworks; - if (qemudStartNetworkDaemon(server, network) < 0) { - return 1; - } - - while (curr) { - if (curr == network) { - if (prev) - prev->next = curr->next; - else - server->inactivenetworks = curr->next; - server->ninactivenetworks--; - break; - } - prev = curr; - curr = curr->next; - } - - network->next = server->activenetworks; - server->activenetworks = network; - server->nactivenetworks++; - - return 0; + return qemudStartNetworkDaemon(server, network); } int qemudNetworkDestroy(struct qemud_server *server, const unsigned char *uuid) { Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -280,14 +280,12 @@ struct qemud_server { int sigread; int nvmfds; int nactivevms; - struct qemud_vm *activevms; int ninactivevms; - struct qemud_vm *inactivevms; + struct qemud_vm *vms; int nextvmid; int nactivenetworks; - struct qemud_network *activenetworks; int ninactivenetworks; - struct qemud_network *inactivenetworks; + struct qemud_network *networks; brControl *brctl; iptablesContext *iptables; char configDir[PATH_MAX]; @@ -317,6 +315,18 @@ void qemudLog(int priority, const char * #define qemudDebug(fmt, ...) do { } while(0); #endif +static inline int +qemudIsActiveVM(struct qemud_vm *vm) +{ + return vm->id != -1; +} + +static inline int +qemudIsActiveNetwork(struct qemud_network *network) +{ + return network->active; +} + #endif /* Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -95,39 +95,43 @@ static int qemudDispatchSignal(struct qe qemudLog(QEMUD_WARN, "Shutting down on signal %d", sigc); /* shutdown active VMs */ - vm = server->activevms; + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; - qemudShutdownVMDaemon(server, vm); + if (qemudIsActiveVM(vm)) + qemudShutdownVMDaemon(server, vm); vm = next; } /* free inactive VMs */ - vm = server->inactivevms; + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; qemudFreeVM(vm); vm = next; } - server->inactivevms = NULL; + server->vms = NULL; + server->nactivevms = 0; server->ninactivevms = 0; /* shutdown active networks */ - network = server->activenetworks; + network = server->networks; while (network) { struct qemud_network *next = network->next; - qemudShutdownNetworkDaemon(server, network); + if (qemudIsActiveNetwork(network)) + qemudShutdownNetworkDaemon(server, network); network = next; } /* free inactive networks */ - network = server->inactivenetworks; + network = server->networks; while (network) { struct qemud_network *next = network->next; qemudFreeNetwork(network); network = next; } - server->inactivenetworks = NULL; + server->networks = NULL; + server->nactivenetworks = 0; server->ninactivenetworks = 0; server->shutdown = 1; @@ -576,6 +580,12 @@ int qemudStartVMDaemon(struct qemud_serv char **argv = NULL; int i, ret = -1; + if (qemudIsActiveVM(vm)) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "VM is already active"); + return -1; + } + if (vm->def->vncPort < 0) vm->def->vncActivePort = 5900 + server->nextvmid; else @@ -586,6 +596,11 @@ int qemudStartVMDaemon(struct qemud_serv if (qemudExec(server, argv, &vm->pid, &vm->stdout, &vm->stderr) == 0) { vm->id = server->nextvmid++; + + server->ninactivevms--; + server->nactivevms++; + server->nvmfds += 2; + ret = 0; } @@ -805,50 +820,24 @@ qemudNetworkIfaceDisconnect(struct qemud } int qemudShutdownVMDaemon(struct qemud_server *server, struct qemud_vm *vm) { - struct qemud_vm *prev = NULL, *curr = server->activevms; struct qemud_vm_net_def *net; - qemudLog(QEMUD_INFO, "Shutting down VM '%s'", vm->def->name); - - /* Already cleaned-up */ - if (vm->pid < 0) + if (!qemudIsActiveVM(vm)) return 0; - kill(vm->pid, SIGTERM); - - /* Move it to inactive vm list */ - while (curr) { - if (curr == vm) { - if (prev) { - prev->next = curr->next; - } else { - server->activevms = curr->next; - } - server->nactivevms--; - - curr->next = server->inactivevms; - server->inactivevms = curr; - server->ninactivevms++; - break; - } - prev = curr; - curr = curr->next; - } + qemudLog(QEMUD_INFO, "Shutting down VM '%s'", vm->def->name); - if (!curr) { - qemudDebug("Could not find VM to shutdown"); - return 0; - } + kill(vm->pid, SIGTERM); - qemudVMData(server, vm, curr->stdout); - qemudVMData(server, vm, curr->stderr); - close(curr->stdout); - close(curr->stderr); - if (curr->monitor != -1) - close(curr->monitor); - curr->stdout = -1; - curr->stderr = -1; - curr->monitor = -1; + qemudVMData(server, vm, vm->stdout); + qemudVMData(server, vm, vm->stderr); + close(vm->stdout); + close(vm->stderr); + if (vm->monitor != -1) + close(vm->monitor); + vm->stdout = -1; + vm->stderr = -1; + vm->monitor = -1; server->nvmfds -= 2; net = vm->def->nets; @@ -874,6 +863,9 @@ int qemudShutdownVMDaemon(struct qemud_s vm->newDef = NULL; } + server->nactivevms--; + server->ninactivevms++; + return 0; } @@ -1121,7 +1113,7 @@ int qemudStartNetworkDaemon(struct qemud const char *name; int err; - if (network->active) { + if (qemudIsActiveNetwork(network)) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "network is already active"); return -1; @@ -1185,6 +1177,9 @@ int qemudStartNetworkDaemon(struct qemud network->active = 1; + server->ninactivenetworks--; + server->nactivenetworks++; + return 0; err_delbr2: @@ -1209,12 +1204,11 @@ int qemudStartNetworkDaemon(struct qemud int qemudShutdownNetworkDaemon(struct qemud_server *server, struct qemud_network *network) { - struct qemud_network *prev, *curr; int err; qemudLog(QEMUD_INFO, "Shutting down network '%s'", network->def->name); - if (!network->active) + if (!qemudIsActiveNetwork(network)) return 0; if (network->dnsmasqPid > 0) @@ -1233,27 +1227,6 @@ int qemudShutdownNetworkDaemon(struct qe network->bridge, strerror(err)); } - /* Move it to inactive networks list */ - prev = NULL; - curr = server->activenetworks; - while (curr) { - if (curr == network) { - if (prev) { - prev->next = curr->next; - } else { - server->activenetworks = curr->next; - } - server->nactivenetworks--; - - curr->next = server->inactivenetworks; - server->inactivenetworks = curr; - server->ninactivenetworks++; - break; - } - prev = curr; - curr = curr->next; - } - if (network->dnsmasqPid > 0 && waitpid(network->dnsmasqPid, NULL, WNOHANG) != network->dnsmasqPid) { kill(network->dnsmasqPid, SIGKILL); @@ -1271,6 +1244,9 @@ int qemudShutdownNetworkDaemon(struct qe network->newDef = NULL; } + server->nactivenetworks--; + server->ninactivenetworks++; + return 0; } @@ -1278,7 +1254,7 @@ int qemudShutdownNetworkDaemon(struct qe static int qemudDispatchPoll(struct qemud_server *server, struct pollfd *fds) { struct qemud_socket *sock = server->sockets; struct qemud_client *client = server->clients; - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm; struct qemud_vm *tmp; struct qemud_network *network, *prevnet; int ret = 0; @@ -1314,12 +1290,18 @@ static int qemudDispatchPoll(struct qemu fd++; client = next; } + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; int failed = 0, stdoutfd = vm->stdout, stderrfd = vm->stderr; + if (!qemudIsActiveVM(vm)) { + vm = next; + continue; + } + if (stdoutfd != -1) { if (fds[fd].revents) { if (fds[fd].revents == POLLIN) { @@ -1353,17 +1335,18 @@ static int qemudDispatchPoll(struct qemu /* Cleanup any VMs which shutdown & dont have an associated config file */ - vm = server->inactivevms; + vm = server->vms; tmp = NULL; while (vm) { - if (!vm->configFile[0]) { + if (!qemudIsActiveVM(vm) && !vm->configFile[0]) { struct qemud_vm *next = vm->next; if (tmp) { tmp->next = next; } else { - server->inactivevms = next; + server->vms = next; } qemudFreeVM(vm); + server->ninactivevms--; vm = next; } else { tmp = vm; @@ -1372,17 +1355,18 @@ static int qemudDispatchPoll(struct qemu } /* Cleanup any networks too */ - network = server->inactivenetworks; + network = server->networks; prevnet = NULL; while (network) { - if (!network->configFile[0]) { + if (!qemudIsActiveNetwork(network) && !network->configFile[0]) { struct qemud_network *next = network->next; if (prevnet) { prevnet->next = next; } else { - server->inactivenetworks = next; + server->networks = next; } qemudFreeNetwork(network); + server->ninactivenetworks--; network = next; } else { prevnet = network; @@ -1419,7 +1403,9 @@ static void qemudPreparePoll(struct qemu fds[fd].events = POLLIN | POLLERR | POLLHUP; fd++; } - for (vm = server->activevms ; vm ; vm = vm->next) { + for (vm = server->vms ; vm ; vm = vm->next) { + if (!qemudIsActiveVM(vm)) + continue; if (vm->stdout != -1) { fds[fd].fd = vm->stdout; fds[fd].events = POLLIN | POLLERR | POLLHUP; --

1 0

[Libvir] [patch 0/9] Revised autostart patches
by Mark McLoughlin 22 Feb '07

22 Feb '07

Hey, Here's the autostart patches again. If you're just looking for what's changed, it's probably fine to just look at patch 3 (some heavy re-factoring to make the autostart stuff easier) and patch 7 (maintains symlinks in the autostart dirs instead of config files). Cheers, Mark. --

1 0

Re: [Libvir] [patch 5/7] Cleanup configDir members
by Daniel P. Berrange 20 Feb '07

20 Feb '07

On Tue, Feb 20, 2007 at 07:26:39PM +0000, Mark McLoughlin wrote: > server->autostartNetworkConfigDir etc. is starting to > get a little unwieldly so put the config directory > paths in an array. > + const char *paths[] = { > + "libvirt/qemu", /* QEMUD_DIR_DOMAINS */ > + "libvirt/qemu/autostart", /* QEMUD_DIR_AUTO_DOMAINS */ > + "libvirt/qemu/networks", /* QEMUD_DIR_NETWORKS */ > + "libvirt/qemu/networks/autostart", /* QEMUD_DIR_AUTO_NETWORKS */ > + }; > + > - if (snprintf(autostartNetworkConfigDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) > - goto snprintf_error; > + base = pw->pw_dir; > + } > > - if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) > + for (i = 0; i < QEMUD_N_CONFIG_DIRS; i++) > + if (snprintf(server->configDirs[i], PATH_MAX, "%s/%s", base, paths[i]) >= PATH_MAX) > goto snprintf_error; > - } I could be reading this wrong, but it looks as if this is going to make the per-user daemon write its config files into $HOME/libvirt Instead of $HOME/.libvirt 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

Re: [Libvir] [patch 1/7] Merge the active and inactive network/guest lists
by Daniel P. Berrange 20 Feb '07

20 Feb '07

On Tue, Feb 20, 2007 at 07:26:03PM +0000, Mark McLoughlin wrote: > Merge the ->activevms and ->inactivevms into a single > ->vms list where each VM has a "active" flag in order > to make things easier to manage. I'm sure I had some interesting reason for keeping the lists separate when i wrote this. Damned if I can think of what it was now :-) The patch does seem to make things simpler. Having an explicit 'active' flag though is redundant. Simply check for 'vm->id == -1' or equivalently the 'vm->pid == -1'. We don't need a 3rd flag to mark inactivity :-) > net = vm->def->nets; > @@ -867,6 +846,7 @@ int qemudShutdownVMDaemon(struct qemud_s > > vm->pid = -1; > vm->id = -1; > + vm->active = 0; > 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

Re: [Libvir] [patch 4/7] Add autostart QEMU implementation
by Daniel P. Berrange 20 Feb '07

20 Feb '07

On Tue, Feb 20, 2007 at 07:26:31PM +0000, Mark McLoughlin wrote: > Actually implement the autostart API in qemud by saving > autostart configs to a specific directory. I think its desirable to keep all the master config files in the same directory, because it gives a sanity check of name uniqueness for files. Instead just create a symlink into the autostart directory in the same way the XenD recommendation works. So setting/getting autostart flag is just a matter of stat()'ing the symlink or using symlink()/unlink() to change it. 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] [patch 7/7] Add autostart support to virsh
by Mark McLoughlin 20 Feb '07

20 Feb '07

Add "autostart" and "net-autostart" commands Also, cleanup the "list" and "net-list" commands a bit and add autostart info to them Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/virsh.c =================================================================== --- libvirt.orig/src/virsh.c +++ libvirt/src/virsh.c @@ -292,6 +292,51 @@ cmdHelp(vshControl * ctl, vshCmd * cmd) } /* + * "autostart" command + */ +static vshCmdInfo info_autostart[] = { + {"syntax", "autostart [--disable] <domain>"}, + {"help", gettext_noop("autostart a domain")}, + {"desc", + gettext_noop("Configure a domain to be automatically started at boot.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_autostart[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, + {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdAutostart(vshControl * ctl, vshCmd * cmd) +{ + virDomainPtr dom; + char *name; + int autostart; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name))) + return FALSE; + + autostart = !vshCommandOptBool(cmd, "disable"); + + if (virDomainSetAutostart(dom, autostart) < 0) { + vshError(ctl, FALSE, _("Failed to %smark domain %s as autostarted"), + autostart ? "" : "un", name); + virDomainFree(dom); + return FALSE; + } + + vshPrint(ctl, _("Domain %s %smarked as autostarted\n"), + name, autostart ? "" : "un"); + + return TRUE; +} + +/* * "connect" command */ static vshCmdInfo info_connect[] = { @@ -473,53 +518,59 @@ cmdList(vshControl * ctl, vshCmd * cmd A qsort(&names[0], maxname, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%3s %-20s %s\n", _("Id"), _("Name"), _("State")); - vshPrintExtra(ctl, "----------------------------------\n"); + vshPrintExtra(ctl, "%3s %-20s %-10s %-10s\n", _("Id"), _("Name"), _("State"), _("Autostart")); + vshPrintExtra(ctl, "---------------------------------------------\n"); for (i = 0; i < maxid; i++) { - int ret; virDomainInfo info; virDomainPtr dom = virDomainLookupByID(ctl->conn, ids[i]); + const char *state, *autostartStr; + int autostart = 0; /* this kind of work with domains is not atomic operation */ if (!dom) continue; - ret = virDomainGetInfo(dom, &info); - vshPrint(ctl, "%3d %-20s %s\n", + if (virDomainGetInfo(dom, &info) < 0) + state = _("no state"); + else + state = _N(vshDomainStateToString(info.state)); + + if (virDomainGetAutostart(dom, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%3d %-20s %-10s %-10s\n", virDomainGetID(dom), virDomainGetName(dom), - ret < - 0 ? _("no state") : _N(vshDomainStateToString(info.state))); + state, + autostartStr); virDomainFree(dom); } for (i = 0; i < maxname; i++) { - int ret; - unsigned int id; virDomainInfo info; virDomainPtr dom = virDomainLookupByName(ctl->conn, names[i]); + const char *state, *autostartStr; + int autostart = 0; /* this kind of work with domains is not atomic operation */ if (!dom) { free(names[i]); continue; } - ret = virDomainGetInfo(dom, &info); - id = virDomainGetID(dom); - if (id == ((unsigned int)-1)) { - vshPrint(ctl, "%3s %-20s %s\n", - "-", - names[i], - ret < - 0 ? "no state" : vshDomainStateToString(info.state)); - } else { - vshPrint(ctl, "%3d %-20s %s\n", - id, - names[i], - ret < - 0 ? "no state" : vshDomainStateToString(info.state)); - } + if (virDomainGetInfo(dom, &info) < 0) + state = _("no state"); + else + state = _N(vshDomainStateToString(info.state)); + + if (virDomainGetAutostart(dom, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%3s %-20s %s %s\n", "-", names[i], state, autostartStr); virDomainFree(dom); free(names[i]); @@ -1632,6 +1683,50 @@ cmdDomuuid(vshControl * ctl, vshCmd * cm return TRUE; } +/* + * "net-autostart" command + */ +static vshCmdInfo info_network_autostart[] = { + {"syntax", "net-autostart [--disable] <network>"}, + {"help", gettext_noop("autostart a network")}, + {"desc", + gettext_noop("Configure a network to be automatically started at boot.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_autostart[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name or uuid")}, + {"disable", VSH_OT_BOOL, 0, gettext_noop("disable autostarting")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkAutostart(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + char *name; + int autostart; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + return FALSE; + + autostart = !vshCommandOptBool(cmd, "disable"); + + if (virNetworkSetAutostart(network, autostart) < 0) { + vshError(ctl, FALSE, _("Failed to %smark network %s as autostarted"), + autostart ? "" : "un", name); + virNetworkFree(network); + return FALSE; + } + + vshPrint(ctl, _("Network %s %smarked as autostarted\n"), + name, autostart ? "" : "un"); + + return TRUE; +} /* * "net-create" command @@ -1895,11 +1990,13 @@ cmdNetworkList(vshControl * ctl, vshCmd qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); } } - vshPrintExtra(ctl, "%-20s\n", _("Name")); - vshPrintExtra(ctl, "----------------------------------\n"); + vshPrintExtra(ctl, "%-20s %-10s %-10s\n", _("Name"), _("State"), _("Autostart")); + vshPrintExtra(ctl, "-----------------------------------------\n"); for (i = 0; i < maxactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, activeNames[i]); + const char *autostartStr; + int autostart = 0; /* this kind of work with networks is not atomic operation */ if (!network) { @@ -1907,13 +2004,22 @@ cmdNetworkList(vshControl * ctl, vshCmd continue; } - vshPrint(ctl, "%-20s\n", - virNetworkGetName(network)); + if (virNetworkGetAutostart(network, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%-20s %-10s %-10s\n", + virNetworkGetName(network), + _("active"), + autostartStr); virNetworkFree(network); free(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); + const char *autostartStr; + int autostart = 0; /* this kind of work with networks is not atomic operation */ if (!network) { @@ -1921,8 +2027,15 @@ cmdNetworkList(vshControl * ctl, vshCmd continue; } - vshPrint(ctl, "%-20s\n", - inactiveNames[i]); + if (virNetworkGetAutostart(network, &autostart) < 0) + autostartStr = _("no autostart"); + else + autostartStr = autostart ? "yes" : "no"; + + vshPrint(ctl, "%-20s %s %s\n", + inactiveNames[i], + _("inactive"), + autostartStr); virNetworkFree(network); free(inactiveNames[i]); @@ -2268,6 +2381,7 @@ cmdQuit(vshControl * ctl, vshCmd * cmd A * Commands */ static vshCmdDef commands[] = { + {"autostart", cmdAutostart, opts_autostart, info_autostart}, {"connect", cmdConnect, opts_connect, info_connect}, {"console", cmdConsole, opts_console, info_console}, {"create", cmdCreate, opts_create, info_create}, @@ -2282,6 +2396,7 @@ static vshCmdDef commands[] = { {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, {"help", cmdHelp, opts_help, info_help}, {"list", cmdList, opts_list, info_list}, + {"net-autostart", cmdNetworkAutostart, opts_network_autostart, info_network_autostart}, {"net-create", cmdNetworkCreate, opts_network_create, info_network_create}, {"net-define", cmdNetworkDefine, opts_network_define, info_network_define}, {"net-destroy", cmdNetworkDestroy, opts_network_destroy, info_network_destroy}, --

1 0

[Libvir] [patch 6/7] Actually autostart guests and networks
by Mark McLoughlin 20 Feb '07

20 Feb '07

Add qemudAutostartConfigs() to autostart guests and networks. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1705,6 +1705,37 @@ int qemudScanConfigDir(struct qemud_serv return 0; } +static +void qemudAutostartConfigs(struct qemud_server *server) { + struct qemud_network *network; + struct qemud_vm *vm; + + network = server->networks; + while (network != NULL) { + struct qemud_network *next = network->next; + if (network->autostart && + !network->active && + qemudNetworkStart(server, network) < 0) + qemudLog(QEMUD_ERR, "Failed to autostart network '%s'", + network->def->name); + + network = next; + } + + vm = server->vms; + while (vm != NULL) { + struct qemud_vm *next = vm->next; + + if (vm->autostart && + !vm->active && + qemudDomainStart(server, vm) < 0) + qemudLog(QEMUD_ERR, "Failed to autostart VM '%s'", + vm->def->name); + + vm = next; + } +} + /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { int i; @@ -1721,6 +1752,8 @@ int qemudScanConfigs(struct qemud_server return -1; } + qemudAutostartConfigs(server); + return 0; } --

1 0

[Libvir] [patch 5/7] Cleanup configDir members
by Mark McLoughlin 20 Feb '07

20 Feb '07

server->autostartNetworkConfigDir etc. is starting to get a little unwieldly so put the config directory paths in an array. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -54,6 +54,15 @@ typedef enum { #endif } qemudLogPriority; +typedef enum { + QEMUD_DIR_DOMAINS = 0, + QEMUD_DIR_AUTO_DOMAINS, + QEMUD_DIR_NETWORKS, + QEMUD_DIR_AUTO_NETWORKS, + + QEMUD_N_CONFIG_DIRS +} qemudConfigDirType; + /* Different types of QEMU acceleration possible */ enum qemud_vm_virt_type { QEMUD_VIRT_QEMU, @@ -292,14 +301,15 @@ struct qemud_server { struct qemud_network *networks; brControl *brctl; iptablesContext *iptables; - char configDir[PATH_MAX]; - char networkConfigDir[PATH_MAX]; - char autostartConfigDir[PATH_MAX]; - char autostartNetworkConfigDir[PATH_MAX]; + char configDirs[QEMUD_N_CONFIG_DIRS][PATH_MAX]; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; unsigned int shutdown : 1; }; +#define domainsDir configDirs[QEMUD_DIR_DOMAINS] +#define autoDomainsDir configDirs[QEMUD_DIR_AUTO_DOMAINS] +#define networksDir configDirs[QEMUD_DIR_NETWORKS] +#define autoNetworksDir configDirs[QEMUD_DIR_AUTO_NETWORKS] int qemudStartVMDaemon(struct qemud_server *server, struct qemud_vm *vm); Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -354,15 +354,22 @@ static int qemudListenUnix(struct qemud_ return 0; } -static int qemudInitPaths(int sys, - char *configDir, - char *networkConfigDir, - char *autostartConfigDir, - char *autostartNetworkConfigDir, +static int qemudInitPaths(struct qemud_server *server, + int sys, char *sockname, char *roSockname, int maxlen) { + const char *paths[] = { + "libvirt/qemu", /* QEMUD_DIR_DOMAINS */ + "libvirt/qemu/autostart", /* QEMUD_DIR_AUTO_DOMAINS */ + "libvirt/qemu/networks", /* QEMUD_DIR_NETWORKS */ + "libvirt/qemu/networks/autostart", /* QEMUD_DIR_AUTO_NETWORKS */ + }; + uid_t uid; + struct passwd *pw; + const char *base = NULL; + int i; uid = geteuid(); @@ -372,18 +379,6 @@ static int qemudInitPaths(int sys, return -1; } - if (snprintf(configDir, maxlen, "%s/libvirt/qemu", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(networkConfigDir, maxlen, "%s/libvirt/qemu/networks", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartConfigDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartNetworkConfigDir, maxlen, "%s/libvirt/qemu/networks/autostart", SYSCONF_DIR) >= maxlen) - goto snprintf_error; - if (snprintf(sockname, maxlen, "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -393,30 +388,24 @@ static int qemudInitPaths(int sys, goto snprintf_error; unlink(sockname); - } else { - struct passwd *pw; + base = SYSCONF_DIR; + } else { if (!(pw = getpwuid(uid))) { qemudLog(QEMUD_ERR, "Failed to find user record for uid '%d': %s", uid, strerror(errno)); return -1; } - if (snprintf(configDir, maxlen, "%s/.libvirt/qemu", pw->pw_dir) >= maxlen) - goto snprintf_error; - - if (snprintf(networkConfigDir, maxlen, "%s/.libvirt/qemu/networks", pw->pw_dir) >= maxlen) - goto snprintf_error; - - if (snprintf(autostartConfigDir, maxlen, "%s/.libvirt/qemu/autostart", pw->pw_dir) >= maxlen) + if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) goto snprintf_error; - if (snprintf(autostartNetworkConfigDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) - goto snprintf_error; + base = pw->pw_dir; + } - if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) + for (i = 0; i < QEMUD_N_CONFIG_DIRS; i++) + if (snprintf(server->configDirs[i], PATH_MAX, "%s/%s", base, paths[i]) >= PATH_MAX) goto snprintf_error; - } return 0; @@ -443,9 +432,7 @@ static struct qemud_server *qemudInitial roSockname[0] = '\0'; - if (qemudInitPaths(sys, server->configDir, server->networkConfigDir, - server->autostartConfigDir, server->autostartNetworkConfigDir, - sockname, roSockname, PATH_MAX) < 0) + if (qemudInitPaths(server, sys, sockname, roSockname, PATH_MAX) < 0) goto cleanup; if (qemudListenUnix(server, sockname, 0) < 0) Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1137,7 +1137,8 @@ int qemudBuildCommandLine(struct qemud_s /* Save a guest's config data into a persistent file */ static int qemudSaveConfig(struct qemud_server *server, - struct qemud_vm *vm) { + struct qemud_vm *vm, + const char *configDir) { char *xml; int fd = -1, ret = -1; int towrite; @@ -1147,10 +1148,10 @@ static int qemudSaveConfig(struct qemud_ return -1; } - if ((err = qemudEnsureDir(!vm->autostart ? server->configDir : server->autostartConfigDir))) { + if ((err = qemudEnsureDir(configDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", - server->configDir, strerror(err)); + configDir, strerror(err)); goto cleanup; } @@ -1247,7 +1248,7 @@ struct qemud_vm *qemudLoadConfigXML(stru vm->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(!vm->autostart ? server->configDir : server->autostartConfigDir, + if (qemudMakeConfigPath(!vm->autostart ? server->domainsDir : server->autoDomainsDir, vm->def->name, ".xml", vm->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); @@ -1256,7 +1257,8 @@ struct qemud_vm *qemudLoadConfigXML(stru return NULL; } - if (qemudSaveConfig(server, vm) < 0) { + if (qemudSaveConfig(server, vm, + !vm->autostart ? server->domainsDir : server->autoDomainsDir) < 0) { if (newVM) qemudFreeVM(vm); return NULL; @@ -1277,7 +1279,8 @@ struct qemud_vm *qemudLoadConfigXML(stru static int qemudSaveNetworkConfig(struct qemud_server *server, - struct qemud_network *network) { + struct qemud_network *network, + const char *configDir) { char *xml; int fd, ret = -1; int towrite; @@ -1287,10 +1290,10 @@ static int qemudSaveNetworkConfig(struct return -1; } - if ((err = qemudEnsureDir(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir))) { + if ((err = qemudEnsureDir(configDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", - server->networkConfigDir, strerror(err)); + configDir, strerror(err)); goto cleanup; } @@ -1600,7 +1603,7 @@ struct qemud_network *qemudLoadNetworkCo network->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir, + if (qemudMakeConfigPath(!network->autostart ? server->networksDir : server->autoNetworksDir, network->def->name, ".xml", network->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); if (newNetwork) @@ -1608,7 +1611,8 @@ struct qemud_network *qemudLoadNetworkCo return NULL; } - if (qemudSaveNetworkConfig(server, network) < 0) { + if (qemudSaveNetworkConfig(server, network, + !network->autostart ? server->networksDir : server->autoNetworksDir) < 0) { if (newNetwork) qemudFreeNetwork(network); return NULL; @@ -1703,12 +1707,20 @@ int qemudScanConfigDir(struct qemud_serv /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { - if (qemudScanConfigDir(server, server->configDir, 1, 0) < 0 || - qemudScanConfigDir(server, server->autostartConfigDir, 1, 1) < 0) - return -1; - if (qemudScanConfigDir(server, server->networkConfigDir, 0, 0) < 0 || - qemudScanConfigDir(server, server->autostartNetworkConfigDir, 0, 1) < 0) - return -1; + int i; + + for (i = 0; i < QEMUD_N_CONFIG_DIRS; i++) { + int isGuest = 0, isAutostart = 0; + + if (i == QEMUD_DIR_DOMAINS || i == QEMUD_DIR_AUTO_DOMAINS) + isGuest = 1; + if (i == QEMUD_DIR_AUTO_DOMAINS || i == QEMUD_DIR_AUTO_NETWORKS) + isAutostart = 1; + + if (qemudScanConfigDir(server, server->configDirs[i], isGuest, isAutostart) < 0) + return -1; + } + return 0; } --

1 0

[Libvir] [patch 4/7] Add autostart QEMU implementation
by Mark McLoughlin 20 Feb '07

20 Feb '07

Actually implement the autostart API in qemud by saving autostart configs to a specific directory. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1147,7 +1147,7 @@ static int qemudSaveConfig(struct qemud_ return -1; } - if ((err = qemudEnsureDir(server->configDir))) { + if ((err = qemudEnsureDir(!vm->autostart ? server->configDir : server->autostartConfigDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", server->configDir, strerror(err)); @@ -1195,7 +1195,8 @@ static int qemudSaveConfig(struct qemud_ struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, const char *file, const char *doc, - int save) { + int save, + int isAutostart) { struct qemud_vm_def *def = NULL; struct qemud_vm *vm = NULL; xmlDocPtr xml; @@ -1239,12 +1240,15 @@ struct qemud_vm *qemudLoadConfigXML(stru newVM = 1; } + vm->autostart = (isAutostart != 0); + if (file) { strncpy(vm->configFile, file, PATH_MAX); vm->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(server->configDir, vm->def->name, ".xml", vm->configFile, PATH_MAX) < 0) { + if (qemudMakeConfigPath(!vm->autostart ? server->configDir : server->autostartConfigDir, + vm->def->name, ".xml", vm->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); if (newVM) @@ -1283,7 +1287,7 @@ static int qemudSaveNetworkConfig(struct return -1; } - if ((err = qemudEnsureDir(server->networkConfigDir))) { + if ((err = qemudEnsureDir(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir))) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config directory %s: %s", server->networkConfigDir, strerror(err)); @@ -1550,7 +1554,8 @@ static struct qemud_network_def *qemudPa struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, const char *file, const char *doc, - int save) { + int save, + int isAutostart) { struct qemud_network_def *def = NULL; struct qemud_network *network = NULL; xmlDocPtr xml; @@ -1588,12 +1593,15 @@ struct qemud_network *qemudLoadNetworkCo newNetwork = 1; } + network->autostart = (isAutostart != 0); + if (file) { strncpy(network->configFile, file, PATH_MAX); network->configFile[PATH_MAX-1] = '\0'; } else { if (save) { - if (qemudMakeConfigPath(server->networkConfigDir, network->def->name, ".xml", network->configFile, PATH_MAX) < 0) { + if (qemudMakeConfigPath(!network->autostart ? server->networkConfigDir : server->autostartNetworkConfigDir, + network->def->name, ".xml", network->configFile, PATH_MAX) < 0) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); if (newNetwork) qemudFreeNetwork(network); @@ -1623,7 +1631,8 @@ struct qemud_network *qemudLoadNetworkCo /* Load a guest from its persistent config file */ static void qemudLoadConfig(struct qemud_server *server, const char *file, - int isGuest) { + int isGuest, + int isAutostart) { FILE *fh; struct stat st; char xml[QEMUD_MAX_XML_LEN]; @@ -1651,9 +1660,9 @@ static void qemudLoadConfig(struct qemud xml[st.st_size] = '\0'; if (isGuest) { - qemudLoadConfigXML(server, file, xml, 1); + qemudLoadConfigXML(server, file, xml, 1, isAutostart); } else { - qemudLoadNetworkConfigXML(server, file, xml, 1); + qemudLoadNetworkConfigXML(server, file, xml, 1, isAutostart); } cleanup: fclose(fh); @@ -1663,7 +1672,8 @@ static void qemudLoadConfig(struct qemud static int qemudScanConfigDir(struct qemud_server *server, const char *configDir, - int isGuest) { + int isGuest, + int isAutostart) { DIR *dir; struct dirent *entry; @@ -1683,7 +1693,7 @@ int qemudScanConfigDir(struct qemud_serv if (qemudMakeConfigPath(configDir, entry->d_name, NULL, file, PATH_MAX) < 0) continue; - qemudLoadConfig(server, file, isGuest); + qemudLoadConfig(server, file, isGuest, isAutostart); } closedir(dir); @@ -1693,9 +1703,13 @@ int qemudScanConfigDir(struct qemud_serv /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { - if (qemudScanConfigDir(server, server->configDir, 1) < 0) + if (qemudScanConfigDir(server, server->configDir, 1, 0) < 0 || + qemudScanConfigDir(server, server->autostartConfigDir, 1, 1) < 0) return -1; - return qemudScanConfigDir(server, server->networkConfigDir, 0); + if (qemudScanConfigDir(server, server->networkConfigDir, 0, 0) < 0 || + qemudScanConfigDir(server, server->autostartNetworkConfigDir, 0, 1) < 0) + return -1; + return 0; } /* Simple grow-on-demand string buffer */ Index: libvirt/qemud/conf.h =================================================================== --- libvirt.orig/qemud/conf.h +++ libvirt/qemud/conf.h @@ -40,7 +40,8 @@ void qemudFreeVM(struct qemud_vm *vm); struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, const char *file, const char *doc, - int persist); + int persist, + int isAutostart); char *qemudGenerateXML(struct qemud_server *server, struct qemud_vm *vm, int live); @@ -49,7 +50,8 @@ void qemudFreeNetwork(struct qemud_netwo struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, const char *file, const char *doc, - int persist); + int persist, + int isAutostart); char *qemudGenerateNetworkXML(struct qemud_server *server, struct qemud_network *network, int live); Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -294,6 +294,8 @@ struct qemud_server { iptablesContext *iptables; char configDir[PATH_MAX]; char networkConfigDir[PATH_MAX]; + char autostartConfigDir[PATH_MAX]; + char autostartNetworkConfigDir[PATH_MAX]; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; unsigned int shutdown : 1; Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -357,6 +357,8 @@ static int qemudListenUnix(struct qemud_ static int qemudInitPaths(int sys, char *configDir, char *networkConfigDir, + char *autostartConfigDir, + char *autostartNetworkConfigDir, char *sockname, char *roSockname, int maxlen) { @@ -376,6 +378,12 @@ static int qemudInitPaths(int sys, if (snprintf(networkConfigDir, maxlen, "%s/libvirt/qemu/networks", SYSCONF_DIR) >= maxlen) goto snprintf_error; + if (snprintf(autostartConfigDir, maxlen, "%s/libvirt/qemu/autostart", SYSCONF_DIR) >= maxlen) + goto snprintf_error; + + if (snprintf(autostartNetworkConfigDir, maxlen, "%s/libvirt/qemu/networks/autostart", SYSCONF_DIR) >= maxlen) + goto snprintf_error; + if (snprintf(sockname, maxlen, "%s/run/libvirt/qemud-sock", LOCAL_STATE_DIR) >= maxlen) goto snprintf_error; @@ -400,6 +408,12 @@ static int qemudInitPaths(int sys, if (snprintf(networkConfigDir, maxlen, "%s/.libvirt/qemu/networks", pw->pw_dir) >= maxlen) goto snprintf_error; + if (snprintf(autostartConfigDir, maxlen, "%s/.libvirt/qemu/autostart", pw->pw_dir) >= maxlen) + goto snprintf_error; + + if (snprintf(autostartNetworkConfigDir, maxlen, "%s/.libvirt/qemu/networks/autostart", pw->pw_dir) >= maxlen) + goto snprintf_error; + if (snprintf(sockname, maxlen, "@%s/.libvirt/qemud-sock", pw->pw_dir) >= maxlen) goto snprintf_error; } @@ -430,6 +444,7 @@ static struct qemud_server *qemudInitial roSockname[0] = '\0'; if (qemudInitPaths(sys, server->configDir, server->networkConfigDir, + server->autostartConfigDir, server->autostartNetworkConfigDir, sockname, roSockname, PATH_MAX) < 0) goto cleanup; Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -281,7 +281,7 @@ int qemudNumDomains(struct qemud_server struct qemud_vm *qemudDomainCreate(struct qemud_server *server, const char *xml) { struct qemud_vm *vm; - if (!(vm = qemudLoadConfigXML(server, NULL, xml, 0))) { + if (!(vm = qemudLoadConfigXML(server, NULL, xml, 0, 0))) { return NULL; } @@ -464,7 +464,7 @@ int qemudDomainStart(struct qemud_server struct qemud_vm *qemudDomainDefine(struct qemud_server *server, const char *xml) { - return qemudLoadConfigXML(server, NULL, xml, 1); + return qemudLoadConfigXML(server, NULL, xml, 1, 0); } int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) { @@ -525,6 +525,9 @@ int qemudDomainSetAutostart(struct qemud const unsigned char *uuid, int autostart) { struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + char oldConfig[PATH_MAX]; + char *xml; + int ret = -1; if (!vm) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); @@ -536,9 +539,35 @@ int qemudDomainSetAutostart(struct qemud if (vm->autostart == autostart) return 0; + if (!(xml = qemudGenerateXML(server, vm, 0))) + goto error; + + strncpy(oldConfig, vm->configFile, PATH_MAX); + oldConfig[PATH_MAX-1] = '\0'; + + if (!qemudLoadConfigXML(server, NULL, xml, 1, autostart)) + goto error; + + if (oldConfig[0] && qemudDeleteConfig(server, oldConfig, vm->def->name) < 0) { + if (unlink(vm->configFile) < 0) + qemudLog(QEMUD_ERR, "Failed to unlink '%s' in order to roll " + "back in qemudDomainSetAutostart(): %s", strerror(errno)); + + strncpy(vm->configFile, oldConfig, PATH_MAX); + vm->configFile[PATH_MAX-1] = '\0'; + + goto error; + } + vm->autostart = autostart; - return 0; + ret = 0; + + error: + if (xml) + free(xml); + + return ret; } struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, @@ -606,7 +635,7 @@ int qemudListDefinedNetworks(struct qemu struct qemud_network *qemudNetworkCreate(struct qemud_server *server, const char *xml) { struct qemud_network *network; - if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 0))) { + if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 0, 0))) { return NULL; } @@ -619,7 +648,7 @@ struct qemud_network *qemudNetworkCreate } struct qemud_network *qemudNetworkDefine(struct qemud_server *server, const char *xml) { - return qemudLoadNetworkConfigXML(server, NULL, xml, 1); + return qemudLoadNetworkConfigXML(server, NULL, xml, 1, 0); } int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { @@ -730,6 +759,9 @@ int qemudNetworkSetAutostart(struct qemu const unsigned char *uuid, int autostart) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + char oldConfig[PATH_MAX]; + char *xml; + int ret = -1; if (!network) { qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); @@ -741,9 +773,35 @@ int qemudNetworkSetAutostart(struct qemu if (network->autostart == autostart) return 0; + if (!(xml = qemudGenerateNetworkXML(server, network, 0))) + goto error; + + strncpy(oldConfig, network->configFile, PATH_MAX); + oldConfig[PATH_MAX-1] = '\0'; + + if (!qemudLoadNetworkConfigXML(server, NULL, xml, 1, autostart)) + goto error; + + if (oldConfig[0] && qemudDeleteConfig(server, oldConfig, network->def->name) < 0) { + if (unlink(network->configFile) < 0) + qemudLog(QEMUD_ERR, "Failed to unlink '%s' in order to roll " + "back in qemudNetworkSetAutostart(): %s", strerror(errno)); + + strncpy(network->configFile, oldConfig, PATH_MAX); + network->configFile[PATH_MAX-1] = '\0'; + + goto error; + } + network->autostart = autostart; - return 0; + ret = 0; + + error: + if (xml) + free(xml); + + return ret; } /* --

1 0

[Libvir] [patch 3/7] Add autostart QEMU stubs
by Mark McLoughlin 20 Feb '07

20 Feb '07

Add the obvious parts of the QEMU implementation of the autostart API. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/dispatch.c =================================================================== --- libvirt.orig/qemud/dispatch.c +++ libvirt/qemud/dispatch.c @@ -717,6 +717,97 @@ static int qemudDispatchNetworkGetBridge return 0; } +static int qemudDispatchDomainGetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + int autostart; + + if (in->header.dataSize != sizeof(in->data.domainGetAutostartRequest)) + return -1; + + autostart = 0; + + ret = qemudDomainGetAutostart(server, + in->data.domainGetAutostartRequest.uuid, + &autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_DOMAIN_GET_AUTOSTART; + out->header.dataSize = sizeof(out->data.networkGetAutostartReply); + out->data.networkGetAutostartReply.autostart = (autostart != 0); + } + return 0; +} + +static int qemudDispatchDomainSetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + + if (in->header.dataSize != sizeof(in->data.domainSetAutostartRequest)) + return -1; + + ret = qemudDomainSetAutostart(server, + in->data.domainGetAutostartRequest.uuid, + in->data.domainSetAutostartRequest.autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_DOMAIN_SET_AUTOSTART; + out->header.dataSize = 0; + } + return 0; +} + +static int qemudDispatchNetworkGetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + int autostart; + + if (in->header.dataSize != sizeof(in->data.networkGetAutostartRequest)) + return -1; + + autostart = 0; + + ret = qemudNetworkGetAutostart(server, + in->data.networkGetAutostartRequest.uuid, + &autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_NETWORK_GET_AUTOSTART; + out->header.dataSize = sizeof(out->data.networkGetAutostartReply); + out->data.networkGetAutostartReply.autostart = (autostart != 0); + } + return 0; +} + +static int qemudDispatchNetworkSetAutostart(struct qemud_server *server, struct qemud_client *client, + struct qemud_packet *in, struct qemud_packet *out) +{ + int ret; + + if (in->header.dataSize != sizeof(in->data.networkSetAutostartRequest)) + return -1; + + ret = qemudNetworkSetAutostart(server, + in->data.networkGetAutostartRequest.uuid, + in->data.networkSetAutostartRequest.autostart); + if (ret < 0) { + if (qemudDispatchFailure(server, client, out) < 0) + return -1; + } else { + out->header.type = QEMUD_PKT_NETWORK_SET_AUTOSTART; + out->header.dataSize = 0; + } + return 0; +} typedef int (*clientFunc)(struct qemud_server *server, struct qemud_client *client, struct qemud_packet *in, struct qemud_packet *out); @@ -759,6 +850,10 @@ clientFunc funcsTransmitRW[QEMUD_PKT_MAX qemudDispatchNetworkDestroy, qemudDispatchNetworkDumpXML, qemudDispatchNetworkGetBridgeName, + qemudDispatchDomainGetAutostart, + qemudDispatchDomainSetAutostart, + qemudDispatchNetworkGetAutostart, + qemudDispatchNetworkSetAutostart, }; clientFunc funcsTransmitRO[QEMUD_PKT_MAX] = { @@ -796,6 +891,10 @@ clientFunc funcsTransmitRO[QEMUD_PKT_MAX NULL, qemudDispatchNetworkDumpXML, qemudDispatchNetworkGetBridgeName, + qemudDispatchDomainGetAutostart, + NULL, + qemudDispatchNetworkGetAutostart, + NULL, }; /* Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -506,6 +506,41 @@ int qemudDomainUndefine(struct qemud_ser return 0; } +int qemudDomainGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + return -1; + } + + *autostart = vm->autostart; + + return 0; +} + +int qemudDomainSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart) { + struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); + + if (!vm) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); + return -1; + } + + autostart = (autostart != 0); + + if (vm->autostart == autostart) + return 0; + + vm->autostart = autostart; + + return 0; +} + struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = server->networks; @@ -676,6 +711,41 @@ int qemudNetworkGetBridgeName(struct qem return 0; } +int qemudNetworkGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + *autostart = network->autostart; + + return 0; +} + +int qemudNetworkSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart) { + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + autostart = (autostart != 0); + + if (network->autostart == autostart) + return 0; + + network->autostart = autostart; + + return 0; +} + /* * Local variables: * indent-tabs-mode: nil Index: libvirt/qemud/driver.h =================================================================== --- libvirt.orig/qemud/driver.h +++ libvirt/qemud/driver.h @@ -85,6 +85,12 @@ struct qemud_vm *qemudDomainDefine(struc const char *xml); int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid); +int qemudDomainGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart); +int qemudDomainSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart); struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid); @@ -117,6 +123,12 @@ int qemudNetworkGetBridgeName(struct qem const unsigned char *uuid, char *ifname, int ifnamelen); +int qemudNetworkGetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int *autostart); +int qemudNetworkSetAutostart(struct qemud_server *server, + const unsigned char *uuid, + int autostart); #endif Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -210,6 +210,7 @@ struct qemud_vm { struct qemud_vm_def *newDef; /* New definition to activate at shutdown */ unsigned int active : 1; + unsigned int autostart : 1; struct qemud_vm *next; }; @@ -249,6 +250,7 @@ struct qemud_network { int dnsmasqPid; unsigned int active : 1; + unsigned int autostart : 1; struct qemud_network *next; }; Index: libvirt/qemud/protocol.h =================================================================== --- libvirt.orig/qemud/protocol.h +++ libvirt/qemud/protocol.h @@ -64,6 +64,10 @@ enum { QEMUD_PKT_NETWORK_DESTROY, QEMUD_PKT_NETWORK_DUMP_XML, QEMUD_PKT_NETWORK_GET_BRIDGE_NAME, + QEMUD_PKT_DOMAIN_GET_AUTOSTART, + QEMUD_PKT_DOMAIN_SET_AUTOSTART, + QEMUD_PKT_NETWORK_GET_AUTOSTART, + QEMUD_PKT_NETWORK_SET_AUTOSTART, QEMUD_PKT_MAX, } qemud_packet_type; @@ -279,6 +283,26 @@ union qemud_packet_data { struct { char ifname[QEMUD_MAX_IFNAME_LEN]; } networkGetBridgeNameReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + } domainGetAutostartRequest; + struct { + int autostart; + } domainGetAutostartReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + unsigned int autostart : 1; + } domainSetAutostartRequest; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + } networkGetAutostartRequest; + struct { + unsigned int autostart : 1; + } networkGetAutostartReply; + struct { + unsigned char uuid[QEMUD_UUID_RAW_LEN]; + unsigned int autostart : 1; + } networkSetAutostartRequest; }; /* Each packet has header & data */ Index: libvirt/src/qemu_internal.c =================================================================== --- libvirt.orig/src/qemu_internal.c +++ libvirt/src/qemu_internal.c @@ -806,6 +806,39 @@ static int qemuUndefine(virDomainPtr dom return ret; } +static int qemuDomainGetAutostart(virDomainPtr dom, + int *autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_DOMAIN_GET_AUTOSTART; + req.header.dataSize = sizeof(req.data.domainGetAutostartRequest); + memmove(req.data.domainGetAutostartRequest.uuid, dom->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(dom->conn, NULL, &req, &reply) < 0) { + return -1; + } + + *autostart = reply.data.domainGetAutostartReply.autostart; + + return 0; +} + +static int qemuDomainSetAutostart(virDomainPtr dom, + int autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_DOMAIN_SET_AUTOSTART; + req.header.dataSize = sizeof(req.data.domainSetAutostartRequest); + req.data.domainSetAutostartRequest.autostart = (autostart != 0); + memmove(req.data.domainSetAutostartRequest.uuid, dom->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(dom->conn, NULL, &req, &reply) < 0) { + return -1; + } + + return 0; +} + static int qemuNetworkOpen(virConnectPtr conn, const char *name, int flags) { @@ -1093,6 +1126,39 @@ static char * qemuNetworkGetBridgeName(v return strdup(reply.data.networkGetBridgeNameReply.ifname); } +static int qemuNetworkGetAutostart(virNetworkPtr network, + int *autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_NETWORK_GET_AUTOSTART; + req.header.dataSize = sizeof(req.data.networkGetAutostartRequest); + memmove(req.data.networkGetAutostartRequest.uuid, network->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(network->conn, NULL, &req, &reply) < 0) { + return -1; + } + + *autostart = reply.data.networkGetAutostartReply.autostart; + + return 0; +} + +static int qemuNetworkSetAutostart(virNetworkPtr network, + int autostart) { + struct qemud_packet req, reply; + + req.header.type = QEMUD_PKT_NETWORK_SET_AUTOSTART; + req.header.dataSize = sizeof(req.data.networkSetAutostartRequest); + req.data.networkSetAutostartRequest.autostart = (autostart != 0); + memmove(req.data.networkSetAutostartRequest.uuid, network->uuid, QEMUD_UUID_RAW_LEN); + + if (qemuProcessRequest(network->conn, NULL, &req, &reply) < 0) { + return -1; + } + + return 0; +} + static virDriver qemuDriver = { VIR_DRV_QEMU, "QEMU", @@ -1132,8 +1198,8 @@ static virDriver qemuDriver = { qemuUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ + qemuDomainGetAutostart, /* domainGetAutostart */ + qemuDomainSetAutostart, /* domainSetAutostart */ }; static virNetworkDriver qemuNetworkDriver = { @@ -1152,8 +1218,8 @@ static virNetworkDriver qemuNetworkDrive qemuNetworkDestroy, /* networkDestroy */ qemuNetworkDumpXML, /* networkDumpXML */ qemuNetworkGetBridgeName, /* networkGetBridgeName */ - NULL, /* networkGetAutostart */ - NULL, /* networkSetAutostart */ + qemuNetworkGetAutostart, /* networkGetAutostart */ + qemuNetworkSetAutostart, /* networkSetAutostart */ }; void qemuRegister(void) { --

1 0

[Libvir] [patch 2/7] Add autostart API
by Mark McLoughlin 20 Feb '07

20 Feb '07

Add virDomainGetAutostart(), virDomainSetAutostart(), virNetworkGetAutostart() and virNetworkSetAutostart(). Add the methods to the drivers' vtables, but don't actually implement it anywhere. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/include/libvirt/libvirt.h.in =================================================================== --- libvirt.orig/include/libvirt/libvirt.h.in +++ libvirt/include/libvirt/libvirt.h.in @@ -328,6 +328,11 @@ int virConnectListDefinedDomains (virC int maxnames); int virDomainCreate (virDomainPtr domain); +int virDomainGetAutostart (virDomainPtr domain, + int *autostart); +int virDomainSetAutostart (virDomainPtr domain, + int autostart); + /** * virVcpuInfo: structure for information about a virtual CPU in a domain. */ @@ -528,6 +533,11 @@ char * virNetworkGetXMLDesc (virNetwor int flags); char * virNetworkGetBridgeName (virNetworkPtr network); +int virNetworkGetAutostart (virNetworkPtr network, + int *autostart); +int virNetworkSetAutostart (virNetworkPtr network, + int autostart); + #ifdef __cplusplus } #endif Index: libvirt/src/libvirt.c =================================================================== --- libvirt.orig/src/libvirt.c +++ libvirt/src/libvirt.c @@ -1862,6 +1862,69 @@ virDomainCreate(virDomainPtr domain) { } /** + * virDomainGetAutostart: + * @domain: a domain object + * + * Return a boolean value indicating whether the domain + * configured to be automatically started when the host + * machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virDomainGetAutostart(virDomainPtr domain, + int *autostart) { + int i; + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(domain, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return (-1); + } + if (!autostart) { + virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + for (i = 0;i < domain->conn->nb_drivers;i++) { + if ((domain->conn->drivers[i] != NULL) && + (domain->conn->drivers[i]->domainGetAutostart != NULL) && + (domain->conn->drivers[i]->domainGetAutostart(domain, autostart) == 0)) + return (0); + } + virLibConnError(domain->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** + * virDomainSetAutostart: + * @domain: a domain object + * + * Configure the domain to be automatically started + * when the host machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virDomainSetAutostart(virDomainPtr domain, + int autostart) { + int i; + + if (!VIR_IS_DOMAIN(domain)) { + virLibDomainError(domain, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + return (-1); + } + + for (i = 0;i < domain->conn->nb_drivers;i++) { + if ((domain->conn->drivers[i] != NULL) && + (domain->conn->drivers[i]->domainSetAutostart != NULL) && + (domain->conn->drivers[i]->domainSetAutostart(domain, autostart) == 0)) + return (0); + } + virLibConnError(domain->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** * virDomainSetVcpus: * @domain: pointer to domain object, or NULL for Domain0 * @nvcpus: the new number of virtual CPUs for this domain @@ -2766,3 +2829,66 @@ virNetworkGetBridgeName(virNetworkPtr ne } return(ret); } + +/** + * virNetworkGetAutostart: + * @network: a network object + * + * Return a boolean value indicating whether the network + * configured to be automatically started when the host + * machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkGetAutostart(virNetworkPtr network, + int *autostart) { + int i; + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + if (!autostart) { + virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + for (i = 0;i < network->conn->nb_network_drivers;i++) { + if ((network->conn->networkDrivers[i] != NULL) && + (network->conn->networkDrivers[i]->networkGetAutostart != NULL) && + (network->conn->networkDrivers[i]->networkGetAutostart(network, autostart) == 0)) + return (0); + } + virLibConnError(network->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** + * virNetworkSetAutostart: + * @network: a network object + * + * Configure the network to be automatically started + * when the host machine boots. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkSetAutostart(virNetworkPtr network, + int autostart) { + int i; + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + + for (i = 0;i < network->conn->nb_network_drivers;i++) { + if ((network->conn->networkDrivers[i] != NULL) && + (network->conn->networkDrivers[i]->networkSetAutostart != NULL) && + (network->conn->networkDrivers[i]->networkSetAutostart(network, autostart) == 0)) + return (0); + } + virLibConnError(network->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} Index: libvirt/src/driver.h =================================================================== --- libvirt.orig/src/driver.h +++ libvirt/src/driver.h @@ -134,6 +134,12 @@ typedef int typedef int (*virDrvDomainDetachDevice) (virDomainPtr domain, char *xml); +typedef int + (*virDrvDomainGetAutostart) (virDomainPtr domain, + int *autostart); +typedef int + (*virDrvDomainSetAutostart) (virDomainPtr domain, + int autostart); typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -183,6 +189,8 @@ struct _virDriver { virDrvDomainUndefine domainUndefine; virDrvDomainAttachDevice domainAttachDevice; virDrvDomainDetachDevice domainDetachDevice; + virDrvDomainGetAutostart domainGetAutostart; + virDrvDomainSetAutostart domainSetAutostart; }; typedef int @@ -219,6 +227,13 @@ typedef char * int flags); typedef char * (*virDrvNetworkGetBridgeName) (virNetworkPtr network); +typedef int + (*virDrvNetworkGetAutostart) (virNetworkPtr network, + int *autostart); +typedef int + (*virDrvNetworkSetAutostart) (virNetworkPtr network, + int autostart); + typedef struct _virNetworkDriver virNetworkDriver; typedef virNetworkDriver *virNetworkDriverPtr; @@ -245,6 +260,8 @@ struct _virNetworkDriver { virDrvNetworkDestroy networkDestroy; virDrvNetworkDumpXML networkDumpXML; virDrvNetworkGetBridgeName networkGetBridgeName; + virDrvNetworkGetAutostart networkGetAutostart; + virDrvNetworkSetAutostart networkSetAutostart; }; Index: libvirt/src/proxy_internal.c =================================================================== --- libvirt.orig/src/proxy_internal.c +++ libvirt/src/proxy_internal.c @@ -81,6 +81,8 @@ static virDriver xenProxyDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/qemu_internal.c =================================================================== --- libvirt.orig/src/qemu_internal.c +++ libvirt/src/qemu_internal.c @@ -1132,6 +1132,8 @@ static virDriver qemuDriver = { qemuUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; static virNetworkDriver qemuNetworkDriver = { @@ -1150,6 +1152,8 @@ static virNetworkDriver qemuNetworkDrive qemuNetworkDestroy, /* networkDestroy */ qemuNetworkDumpXML, /* networkDumpXML */ qemuNetworkGetBridgeName, /* networkGetBridgeName */ + NULL, /* networkGetAutostart */ + NULL, /* networkSetAutostart */ }; void qemuRegister(void) { Index: libvirt/src/test.c =================================================================== --- libvirt.orig/src/test.c +++ libvirt/src/test.c @@ -125,6 +125,8 @@ static virDriver testDriver = { testDomainUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; typedef struct _testDev { Index: libvirt/src/xen_internal.c =================================================================== --- libvirt.orig/src/xen_internal.c +++ libvirt/src/xen_internal.c @@ -454,6 +454,8 @@ static virDriver xenHypervisorDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; #endif /* !PROXY */ Index: libvirt/src/xend_internal.c =================================================================== --- libvirt.orig/src/xend_internal.c +++ libvirt/src/xend_internal.c @@ -96,7 +96,9 @@ static virDriver xenDaemonDriver = { xenDaemonDomainDefineXML, /* domainDefineXML */ xenDaemonDomainUndefine, /* domainUndefine */ xenDaemonAttachDevice, /* domainAttachDevice */ - xenDaemonDetachDevice /* domainDetachDevice */ + xenDaemonDetachDevice, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/xm_internal.c =================================================================== --- libvirt.orig/src/xm_internal.c +++ libvirt/src/xm_internal.c @@ -104,6 +104,8 @@ static virDriver xenXMDriver = { xenXMDomainUndefine, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; static void Index: libvirt/src/xs_internal.c =================================================================== --- libvirt.orig/src/xs_internal.c +++ libvirt/src/xs_internal.c @@ -75,6 +75,8 @@ static virDriver xenStoreDriver = { NULL, /* domainUndefine */ NULL, /* domainAttachDevice */ NULL, /* domainDetachDevice */ + NULL, /* domainGetAutostart */ + NULL, /* domainSetAutostart */ }; /** Index: libvirt/src/libvirt_sym.version =================================================================== --- libvirt.orig/src/libvirt_sym.version +++ libvirt/src/libvirt_sym.version @@ -37,6 +37,8 @@ virConnectListDefinedDomains; virConnectNumOfDefinedDomains; virDomainUndefine; + virDomainGetAutostart; + virDomainSetAutostart; virGetVersion; virCopyLastError; virConnSetErrorFunc; @@ -76,6 +78,8 @@ virNetworkGetUUIDString; virNetworkGetXMLDesc; virNetworkGetBridgeName; + virNetworkGetAutostart; + virNetworkSetAutostart; local: *; }; --

1 0

[Libvir] [patch 1/7] Merge the active and inactive network/guest lists
by Mark McLoughlin 20 Feb '07

20 Feb '07

Merge the ->activevms and ->inactivevms into a single ->vms list where each VM has a "active" flag in order to make things easier to manage. Likewise for networks. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/qemud/conf.c =================================================================== --- libvirt.orig/qemud/conf.c +++ libvirt/qemud/conf.c @@ -1215,7 +1215,7 @@ struct qemud_vm *qemudLoadConfigXML(stru xmlFreeDoc(xml); if ((vm = qemudFindVMByName(server, def->name))) { - if (vm->id == -1) { + if (!vm->active) { qemudFreeVMDef(vm->def); vm->def = def; } else { @@ -1263,8 +1263,8 @@ struct qemud_vm *qemudLoadConfigXML(stru } if (newVM) { - vm->next = server->inactivevms; - server->inactivevms = vm; + vm->next = server->vms; + server->vms = vm; server->ninactivevms++; } @@ -1611,8 +1611,8 @@ struct qemud_network *qemudLoadNetworkCo } if (newNetwork) { - network->next = server->inactivenetworks; - server->inactivenetworks = network; + network->next = server->networks; + server->networks = network; server->ninactivenetworks++; } Index: libvirt/qemud/driver.c =================================================================== --- libvirt.orig/qemud/driver.c +++ libvirt/qemud/driver.c @@ -222,10 +222,10 @@ static int qemudGetProcessInfo(unsigned } struct qemud_vm *qemudFindVMByID(const struct qemud_server *server, int id) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { - if (vm->id == id) + if (vm->active && vm->id == id) return vm; vm = vm->next; } @@ -235,7 +235,7 @@ struct qemud_vm *qemudFindVMByID(const s struct qemud_vm *qemudFindVMByUUID(const struct qemud_server *server, const unsigned char *uuid) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { if (!memcmp(vm->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) @@ -243,19 +243,12 @@ struct qemud_vm *qemudFindVMByUUID(const vm = vm->next; } - vm = server->inactivevms; - while (vm) { - if (!memcmp(vm->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) - return vm; - vm = vm->next; - } - return NULL; } struct qemud_vm *qemudFindVMByName(const struct qemud_server *server, const char *name) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; while (vm) { if (!strcmp(vm->def->name, name)) @@ -263,13 +256,6 @@ struct qemud_vm *qemudFindVMByName(const vm = vm->next; } - vm = server->inactivevms; - while (vm) { - if (!strcmp(vm->def->name, name)) - return vm; - vm = vm->next; - } - return NULL; } @@ -278,12 +264,14 @@ int qemudGetVersion(struct qemud_server } int qemudListDomains(struct qemud_server *server, int *ids, int nids) { - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm = server->vms; int got = 0; while (vm && got < nids) { - ids[got] = vm->id; + if (vm->active) { + ids[got] = vm->id; + got++; + } vm = vm->next; - got++; } return got; } @@ -444,13 +432,15 @@ int qemudDomainDumpXML(struct qemud_serv int qemudListDefinedDomains(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_vm *vm = server->inactivevms; + struct qemud_vm *vm = server->vms; int got = 0; while (vm && got < nnames) { - strncpy(names[got], vm->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (!vm->active) { + strncpy(names[got], vm->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } vm = vm->next; - got++; } return got; } @@ -462,26 +452,10 @@ int qemudNumDefinedDomains(struct qemud_ int qemudDomainStart(struct qemud_server *server, struct qemud_vm *vm) { - struct qemud_vm *prev = NULL, *curr = server->inactivevms; - if (qemudStartVMDaemon(server, vm) < 0) { + if (qemudStartVMDaemon(server, vm) < 0) return 1; - } - - while (curr) { - if (curr == vm) { - if (prev) - prev->next = curr->next; - else - server->inactivevms = curr->next; - server->ninactivevms--; - break; - } - prev = curr; - curr = curr->next; - } - vm->next = server->activevms; - server->activevms = vm; + server->ninactivevms--; server->nactivevms++; server->nvmfds += 2; @@ -495,14 +469,14 @@ struct qemud_vm *qemudDomainDefine(struc int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_vm *vm = qemudFindVMByUUID(server, uuid); - struct qemud_vm *prev = NULL, *curr = server->inactivevms; + struct qemud_vm *prev = NULL, *curr = server->vms; if (!vm) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no domain with matching uuid"); return -1; } - if (vm->pid != -1) { + if (vm->active) { qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot delete active domain"); return -1; } @@ -517,7 +491,7 @@ int qemudDomainUndefine(struct qemud_ser if (prev) { prev->next = curr->next; } else { - server->inactivevms = curr->next; + server->vms = curr->next; } server->ninactivevms--; break; @@ -534,7 +508,7 @@ int qemudDomainUndefine(struct qemud_ser struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid) { - struct qemud_network *network = server->activenetworks; + struct qemud_network *network = server->networks; while (network) { if (!memcmp(network->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) @@ -542,19 +516,12 @@ struct qemud_network *qemudFindNetworkBy network = network->next; } - network = server->inactivenetworks; - while (network) { - if (!memcmp(network->def->uuid, uuid, QEMUD_UUID_RAW_LEN)) - return network; - network = network->next; - } - return NULL; } struct qemud_network *qemudFindNetworkByName(const struct qemud_server *server, const char *name) { - struct qemud_network *network = server->activenetworks; + struct qemud_network *network = server->networks; while (network) { if (!strcmp(network->def->name, name)) @@ -562,13 +529,6 @@ struct qemud_network *qemudFindNetworkBy network = network->next; } - network = server->inactivenetworks; - while (network) { - if (!strcmp(network->def->name, name)) - return network; - network = network->next; - } - return NULL; } @@ -577,13 +537,15 @@ int qemudNumNetworks(struct qemud_server } int qemudListNetworks(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_network *network = server->activenetworks; + struct qemud_network *network = server->networks; int got = 0; while (network && got < nnames) { - strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (network->active) { + strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } network = network->next; - got++; } return got; } @@ -593,13 +555,15 @@ int qemudNumDefinedNetworks(struct qemud } int qemudListDefinedNetworks(struct qemud_server *server, char *const*names, int nnames) { - struct qemud_network *network = server->inactivenetworks; + struct qemud_network *network = server->networks; int got = 0; while (network && got < nnames) { - strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); - names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + if (!network->active) { + strncpy(names[got], network->def->name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + got++; + } network = network->next; - got++; } return got; } @@ -625,7 +589,7 @@ struct qemud_network *qemudNetworkDefine int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); - struct qemud_network *prev = NULL, *curr = server->inactivenetworks; + struct qemud_network *prev = NULL, *curr = server->networks; if (!network) { qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no network with matching uuid"); @@ -642,7 +606,7 @@ int qemudNetworkUndefine(struct qemud_se if (prev) { prev->next = curr->next; } else { - server->inactivenetworks = curr->next; + server->networks = curr->next; } server->ninactivenetworks--; break; @@ -658,26 +622,10 @@ int qemudNetworkUndefine(struct qemud_se } int qemudNetworkStart(struct qemud_server *server, struct qemud_network *network) { - struct qemud_network *prev = NULL, *curr = server->inactivenetworks; - if (qemudStartNetworkDaemon(server, network) < 0) { + if (qemudStartNetworkDaemon(server, network) < 0) return 1; - } - - while (curr) { - if (curr == network) { - if (prev) - prev->next = curr->next; - else - server->inactivenetworks = curr->next; - server->ninactivenetworks--; - break; - } - prev = curr; - curr = curr->next; - } - network->next = server->activenetworks; - server->activenetworks = network; + server->ninactivenetworks--; server->nactivenetworks++; return 0; Index: libvirt/qemud/internal.h =================================================================== --- libvirt.orig/qemud/internal.h +++ libvirt/qemud/internal.h @@ -209,6 +209,8 @@ struct qemud_vm { struct qemud_vm_def *def; /* The current definition */ struct qemud_vm_def *newDef; /* New definition to activate at shutdown */ + unsigned int active : 1; + struct qemud_vm *next; }; @@ -280,14 +282,12 @@ struct qemud_server { int sigread; int nvmfds; int nactivevms; - struct qemud_vm *activevms; int ninactivevms; - struct qemud_vm *inactivevms; + struct qemud_vm *vms; int nextvmid; int nactivenetworks; - struct qemud_network *activenetworks; int ninactivenetworks; - struct qemud_network *inactivenetworks; + struct qemud_network *networks; brControl *brctl; iptablesContext *iptables; char configDir[PATH_MAX]; Index: libvirt/qemud/qemud.c =================================================================== --- libvirt.orig/qemud/qemud.c +++ libvirt/qemud/qemud.c @@ -95,39 +95,43 @@ static int qemudDispatchSignal(struct qe qemudLog(QEMUD_WARN, "Shutting down on signal %d", sigc); /* shutdown active VMs */ - vm = server->activevms; + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; - qemudShutdownVMDaemon(server, vm); + if (vm->active) + qemudShutdownVMDaemon(server, vm); vm = next; } /* free inactive VMs */ - vm = server->inactivevms; + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; qemudFreeVM(vm); vm = next; } - server->inactivevms = NULL; + server->vms = NULL; + server->nactivevms = 0; server->ninactivevms = 0; /* shutdown active networks */ - network = server->activenetworks; + network = server->networks; while (network) { struct qemud_network *next = network->next; - qemudShutdownNetworkDaemon(server, network); + if (network->active) + qemudShutdownNetworkDaemon(server, network); network = next; } /* free inactive networks */ - network = server->inactivenetworks; + network = server->networks; while (network) { struct qemud_network *next = network->next; qemudFreeNetwork(network); network = next; } - server->inactivenetworks = NULL; + server->networks = NULL; + server->nactivenetworks = 0; server->ninactivenetworks = 0; server->shutdown = 1; @@ -586,6 +590,7 @@ int qemudStartVMDaemon(struct qemud_serv if (qemudExec(server, argv, &vm->pid, &vm->stdout, &vm->stderr) == 0) { vm->id = server->nextvmid++; + vm->active = 1; ret = 0; } @@ -805,50 +810,24 @@ qemudNetworkIfaceDisconnect(struct qemud } int qemudShutdownVMDaemon(struct qemud_server *server, struct qemud_vm *vm) { - struct qemud_vm *prev = NULL, *curr = server->activevms; struct qemud_vm_net_def *net; - qemudLog(QEMUD_INFO, "Shutting down VM '%s'", vm->def->name); - - /* Already cleaned-up */ - if (vm->pid < 0) + if (!vm->active) return 0; - kill(vm->pid, SIGTERM); - - /* Move it to inactive vm list */ - while (curr) { - if (curr == vm) { - if (prev) { - prev->next = curr->next; - } else { - server->activevms = curr->next; - } - server->nactivevms--; - - curr->next = server->inactivevms; - server->inactivevms = curr; - server->ninactivevms++; - break; - } - prev = curr; - curr = curr->next; - } + qemudLog(QEMUD_INFO, "Shutting down VM '%s'", vm->def->name); - if (!curr) { - qemudDebug("Could not find VM to shutdown"); - return 0; - } + kill(vm->pid, SIGTERM); - qemudVMData(server, vm, curr->stdout); - qemudVMData(server, vm, curr->stderr); - close(curr->stdout); - close(curr->stderr); - if (curr->monitor != -1) - close(curr->monitor); - curr->stdout = -1; - curr->stderr = -1; - curr->monitor = -1; + qemudVMData(server, vm, vm->stdout); + qemudVMData(server, vm, vm->stderr); + close(vm->stdout); + close(vm->stderr); + if (vm->monitor != -1) + close(vm->monitor); + vm->stdout = -1; + vm->stderr = -1; + vm->monitor = -1; server->nvmfds -= 2; net = vm->def->nets; @@ -867,6 +846,7 @@ int qemudShutdownVMDaemon(struct qemud_s vm->pid = -1; vm->id = -1; + vm->active = 0; if (vm->newDef) { qemudFreeVMDef(vm->def); @@ -874,6 +854,9 @@ int qemudShutdownVMDaemon(struct qemud_s vm->newDef = NULL; } + server->nactivevms--; + server->ninactivevms++; + return 0; } @@ -1209,7 +1192,6 @@ int qemudStartNetworkDaemon(struct qemud int qemudShutdownNetworkDaemon(struct qemud_server *server, struct qemud_network *network) { - struct qemud_network *prev, *curr; int err; qemudLog(QEMUD_INFO, "Shutting down network '%s'", network->def->name); @@ -1233,27 +1215,6 @@ int qemudShutdownNetworkDaemon(struct qe network->bridge, strerror(err)); } - /* Move it to inactive networks list */ - prev = NULL; - curr = server->activenetworks; - while (curr) { - if (curr == network) { - if (prev) { - prev->next = curr->next; - } else { - server->activenetworks = curr->next; - } - server->nactivenetworks--; - - curr->next = server->inactivenetworks; - server->inactivenetworks = curr; - server->ninactivenetworks++; - break; - } - prev = curr; - curr = curr->next; - } - if (network->dnsmasqPid > 0 && waitpid(network->dnsmasqPid, NULL, WNOHANG) != network->dnsmasqPid) { kill(network->dnsmasqPid, SIGKILL); @@ -1271,6 +1232,9 @@ int qemudShutdownNetworkDaemon(struct qe network->newDef = NULL; } + server->nactivenetworks--; + server->ninactivenetworks++; + return 0; } @@ -1278,7 +1242,7 @@ int qemudShutdownNetworkDaemon(struct qe static int qemudDispatchPoll(struct qemud_server *server, struct pollfd *fds) { struct qemud_socket *sock = server->sockets; struct qemud_client *client = server->clients; - struct qemud_vm *vm = server->activevms; + struct qemud_vm *vm; struct qemud_vm *tmp; struct qemud_network *network, *prevnet; int ret = 0; @@ -1314,12 +1278,18 @@ static int qemudDispatchPoll(struct qemu fd++; client = next; } + vm = server->vms; while (vm) { struct qemud_vm *next = vm->next; int failed = 0, stdoutfd = vm->stdout, stderrfd = vm->stderr; + if (!vm->active) { + vm = next; + continue; + } + if (stdoutfd != -1) { if (fds[fd].revents) { if (fds[fd].revents == POLLIN) { @@ -1353,17 +1323,18 @@ static int qemudDispatchPoll(struct qemu /* Cleanup any VMs which shutdown & dont have an associated config file */ - vm = server->inactivevms; + vm = server->vms; tmp = NULL; while (vm) { - if (!vm->configFile[0]) { + if (!vm->active && !vm->configFile[0]) { struct qemud_vm *next = vm->next; if (tmp) { tmp->next = next; } else { - server->inactivevms = next; + server->vms = next; } qemudFreeVM(vm); + server->ninactivevms--; vm = next; } else { tmp = vm; @@ -1372,17 +1343,18 @@ static int qemudDispatchPoll(struct qemu } /* Cleanup any networks too */ - network = server->inactivenetworks; + network = server->networks; prevnet = NULL; while (network) { - if (!network->configFile[0]) { + if (!network->active && !network->configFile[0]) { struct qemud_network *next = network->next; if (prevnet) { prevnet->next = next; } else { - server->inactivenetworks = next; + server->networks = next; } qemudFreeNetwork(network); + server->ninactivenetworks--; network = next; } else { prevnet = network; @@ -1419,7 +1391,9 @@ static void qemudPreparePoll(struct qemu fds[fd].events = POLLIN | POLLERR | POLLHUP; fd++; } - for (vm = server->activevms ; vm ; vm = vm->next) { + for (vm = server->vms ; vm ; vm = vm->next) { + if (!vm->active) + continue; if (vm->stdout != -1) { fds[fd].fd = vm->stdout; fds[fd].events = POLLIN | POLLERR | POLLHUP; --

1 0

[Libvir] [patch 0/7] Autostart API patches
by Mark McLoughlin 20 Feb '07

20 Feb '07

Hey, So, this took a bit longer than I expected. I think these patches do pretty much what we discussed for autostart, instead of have the flag in the XML. Appreciate people looking over the patches. Thanks, Mark. --

1 0

[Libvir] support for VMware
by "René Castillo" 20 Feb '07

20 Feb '07

Hi, I am looking for a library that handles features of multiple virtualization environments. libvirt can manage Xen, QEMU and KVM, but what other hypervisors are planned to be supported? Are there plans to support basic functionality of VMware virtualized nodes, e.g. ESX Server? bye, Rene -- "Feel free" - 10 GB Mailbox, 100 FreeSMS/Monat ... Jetzt GMX TopMail testen: www.gmx.net/de/go/mailfooter/topmail-out

2 1

[Libvir] [patch 0/9] More miscellaneous qemud patches
by Mark McLoughlin 20 Feb '07

20 Feb '07

Hey, Okay, here's another batch of qemud patches I've committed. The most significant ones are the signal handling and error reporting ones at the end. Appreciate someone looking over them. Thanks, Mark. --

4 25

[Libvir] [PATCH] to run on IA64
by Atsushi SAKAI 20 Feb '07

20 Feb '07

Hi, This patch intends to run libvirt 0.2.0 on IA64. Signed-off-by: Atsushi SAKAI <sakaia(a)jp.fujitsu.com> Just one question, is there any plan to support big/little endian for libvirt? (related to network) Thanks Atsushi SAKAI

3 10

[Libvir] PATCH: Update the AUTHORS file to reflect contributions
by Daniel P. Berrange 19 Feb '07

19 Feb '07

Just noticed that the AUTHORS file is empty aside from Daniel & Karel. So I've gone through the ChangeLog file and built a list of everyone who has contributed patches to libvirt since inception. I'm attaching a patch which updates the AUTHORS file to include these people. I've also broken out folks who've contributed major drivers / subsystems to identify the areas of particular expertise for ongoing maintenance. All the ordering is chronological ie based on where in the ChangeLog I found the respective names. If anyone knows of folks who contributed patches, but whom I've missed from the list let me know so I can rectify it... 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 -=|

1 0

[Libvir] [patch 0/9] Preliminary patches for virtual networks support
by markmc＠redhat.com 17 Feb '07

17 Feb '07

Hi, Yesterday I went ahead and committed the virtual networks support in time for DV to make a release. I thought it'd be worth sending them here so that people can look over them and hopefully sport any problems. So, here's the first batch - various fixes to the qemu support and small bits of re-factoring in other parts of libvirt. Cheers, Mark. --

4 13

[Fwd: Re: [Libvir] Autostarting guests and networks]
by Hugh Brock 16 Feb '07

16 Feb '07

Oops, meant to send this to the list... --H -- Red Hat Virtualization Group http://redhat.com/virtualization Hugh Brock | virt-manager http://virt-manager.org hbrock(a)redhat.com | virtualization library http://libvirt.org

1 0

[Libvir] [PATCH] Add Require gnutls-devel for SRPM build
by Atsushi SAKAI 16 Feb '07

16 Feb '07

Hi, This patch adds a Require gnutls-devel for "libvirt.spec" file. Signed-off-by: Atsushi SAKAI <sakaia(a)jp.fujitsu.com> Anyway, libvirt SRPM cannot build on IA64. We are investigating on this. Is threre any good idea? Thanks Atsushi SAKAI

2 2

[Libvir] [PATCH] Remove init from virDriver structure.
by Richard W.M. Jones 16 Feb '07

16 Feb '07

-- 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) From 8f04c42e183fc0e339fdef993ec10833a056e791 Mon Sep 17 00:00:00 2001 From: Richard Jones <rjones(a)redhat.com> Date: Fri, 16 Feb 2007 14:55:18 +0000 Subject: [PATCH] Remove init from virDriver structure. init was never called, and only xen_internal tried to use it. --- src/driver.h | 3 --- src/proxy_internal.c | 1 - src/qemu_internal.c | 1 - src/test.c | 1 - src/xen_internal.c | 5 ++--- src/xend_internal.c | 1 - src/xm_internal.c | 1 - src/xs_internal.c | 1 - 8 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/driver.h b/src/driver.h index c467ad0..7d79b11 100644 --- a/src/driver.h +++ b/src/driver.h @@ -33,8 +33,6 @@ typedef enum { } virDrvOpenFlag; typedef int - (*virDrvInit) (void); -typedef int (*virDrvOpen) (virConnectPtr conn, const char *name, int flags); @@ -150,7 +148,6 @@ struct _virDriver { int no; /* the number virDrvNo */ const char * name; /* the name of the driver */ unsigned long ver; /* the version of the backend */ - virDrvInit init; virDrvOpen open; virDrvClose close; virDrvGetType type; diff --git a/src/proxy_internal.c b/src/proxy_internal.c index 1e6e453..c7c325b 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -46,7 +46,6 @@ static virDriver xenProxyDriver = { VIR_DRV_XEN_PROXY, "XenProxy", 0, - NULL, /* init */ xenProxyOpen, /* open */ xenProxyClose, /* close */ NULL, /* type */ diff --git a/src/qemu_internal.c b/src/qemu_internal.c index a65b073..3fcf10f 100644 --- a/src/qemu_internal.c +++ b/src/qemu_internal.c @@ -1097,7 +1097,6 @@ static virDriver qemuDriver = { VIR_DRV_QEMU, "QEMU", LIBVIR_VERSION_NUMBER, - NULL, /* init */ qemuOpen, /* open */ qemuClose, /* close */ NULL, /* type */ diff --git a/src/test.c b/src/test.c index 4025f99..5052cbd 100644 --- a/src/test.c +++ b/src/test.c @@ -90,7 +90,6 @@ static virDriver testDriver = { VIR_DRV_TEST, "Test", LIBVIR_VERSION_NUMBER, - NULL, /* init */ testOpen, /* open */ testClose, /* close */ NULL, /* type */ diff --git a/src/xen_internal.c b/src/xen_internal.c index f885c66..32c550e 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -411,7 +411,6 @@ typedef struct xen_op_v2_dom xen_op_v2_dom; static const char * xenHypervisorGetType(virConnectPtr conn); static unsigned long xenHypervisorGetMaxMemory(virDomainPtr domain); #endif -static int xenHypervisorInit(void); #ifndef PROXY static virDriver xenHypervisorDriver = { @@ -420,7 +419,6 @@ static virDriver xenHypervisorDriver = { (DOM0_INTERFACE_VERSION >> 24) * 1000000 + ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 + (DOM0_INTERFACE_VERSION & 0xFFFF), - xenHypervisorInit, /* init */ xenHypervisorOpen, /* open */ xenHypervisorClose, /* close */ xenHypervisorGetType, /* type */ @@ -1127,7 +1125,8 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, * Initialize the hypervisor layer. Try to detect the kind of interface * used i.e. pre or post changeset 10277 */ -int xenHypervisorInit(void) +int +xenHypervisorInit(void) { int fd, ret, cmd; hypercall_t hc; diff --git a/src/xend_internal.c b/src/xend_internal.c index 2ec32a8..d78cbba 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -62,7 +62,6 @@ static virDriver xenDaemonDriver = { (DOM0_INTERFACE_VERSION >> 24) * 1000000 + ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 + (DOM0_INTERFACE_VERSION & 0xFFFF), - NULL, /* init */ xenDaemonOpen, /* open */ xenDaemonClose, /* close */ xenDaemonGetType, /* type */ diff --git a/src/xm_internal.c b/src/xm_internal.c index ccc24b1..2e1d88e 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -69,7 +69,6 @@ static virDriver xenXMDriver = { (DOM0_INTERFACE_VERSION >> 24) * 1000000 + ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 + (DOM0_INTERFACE_VERSION & 0xFFFF), - NULL, /* init */ xenXMOpen, /* open */ xenXMClose, /* close */ xenXMGetType, /* type */ diff --git a/src/xs_internal.c b/src/xs_internal.c index 9dca5b2..bf7e36e 100644 --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -40,7 +40,6 @@ static virDriver xenStoreDriver = { (DOM0_INTERFACE_VERSION >> 24) * 1000000 + ((DOM0_INTERFACE_VERSION >> 16) & 0xFF) * 1000 + (DOM0_INTERFACE_VERSION & 0xFFFF), - NULL, /* init */ xenStoreOpen, /* open */ xenStoreClose, /* close */ NULL, /* type */ -- 1.4.4.2

2 1

[Libvir] [patch 00/12] Virtual networks support
by markmc＠redhat.com 15 Feb '07

15 Feb '07

Hey, And here's the actual patches to add virtual networks support ... Cheers, Mark. --

1 12

[Libvir] Release of libvirt-0.2.0
by Daniel Veillard 14 Feb '07

14 Feb '07

That's it, it's out ! This include the KVM and QEmu support, and the networking that was discussed for some time now. Since that's a serious set of changes I bumped the intermediate version number, beware ! Available as usual from ftp://libvirt.org/libvirt/ * Various internal cleanups (Mark McLoughlin, Richard Jones, Daniel Berrange, Karel Zak) * Bug fixes: - avoid a crash in connect (Daniel Berrange) - virsh args parsing (Richard Jones) * Add support for QEmu and KVM virtualization (Daniel Berrange) * Add support for network configuration (Mark McLoughlin) * Minor improvements: - regression testing (Daniel Berrange) - localization string updates Thanks to all who contributed, enjoy ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] libmm
by Richard W.M. Jones 14 Feb '07

14 Feb '07

Does anyone object to adding a dep to libmm (http://www.ossp.org/man/man.cgi/pkg/lib/mm/mm.pod) to libvirt? It simplifies sharing of data between preforked libvirtd instances, and allows us to persist that data (while at the same time not requiring it). 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)

2 1

[Libvir] PATCH 0/2 QEMU driver
by Daniel P. Berrange 14 Feb '07

14 Feb '07

What follows is yet another iteration of the QEMU patches. Based on recent discussions about a generic remote management daemon, this patch set has been stripped to remove all TCP functionality, and TLS encryption. It is now local only unix domain sockets, with no encyption. THe idea being that the generic libvirtd will be able to expose this over the network securely. The patchset is split into two halves - the driver and the daemon. There will be further explanation alongside each patch. 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 7

[Libvir] Preliminary patch to support remote driver / libvirtd
by Richard W.M. Jones 13 Feb '07

13 Feb '07

This patch is just for discussion. It's not in a state to be applied, even if it were accepted (which is a long-shot at present anyway). When looking at the patch, a good starting point is to search for "Architecture and notes" and read from there. Supports: * remote driver (just does the "open", "close", "type" and "version" calls at present as a proof of concept) * TLS transport (built using GnuTLS) * SSH transport (forks external ssh process) * TCP transport (unencrypted - just for testing) * Unix domain socket transport * arbitrary external program / shell script transport * IPv6-ready on client & server I've tested all the transports, and in limited tests they all seem to work. ie. You really can do: virsh -c remote:tls:server version Shortcomings in this version: * in "open" call, name must be non-NULL (this is just a bug) * doesn't actually invoke libvirt on the server side; just prints out messages and returns dummy values * "ssh" not recognised as a service name by getaddrinfo, so you must always give a port number, ie. remote:ssh:server:22 * /tmp/socket should be cleaned up when the server exits Potential problems: * SunRPC is stateless so we need to hand out a cookie to represent the virConnectPtr handle on the server side. However if the client dies without explicitly calling close, we have no way to know, and so the cookie/handle on the server side lives forever. * There's some confusion about the level of abstraction. At the moment I'm abstracting at the driver level, but that may be wrong and possibly I should be abstracting at the level of vir* calls. On the other hand, there's not a huge amount of difference. * Security: Is it safe for libvirt to be connecting to arbitrary TCP sockets? Is it safe for libvirt to be able to run arbitrary programs? 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) ? src/libvirtd.c ? src/remote_internal.c ? src/remote_internal.h ? src/remote_rpc.x ? src/sunrpc/README ? src/sunrpc/clnt_ext.c ? src/sunrpc/clnt_ext.h ? src/sunrpc/clnt_gnutls.c ? src/sunrpc/clnt_gnutls.h ? src/sunrpc/clnt_tcp2.c ? src/sunrpc/clnt_tcp2.h ? src/sunrpc/create_xid.c ? src/sunrpc/svc_gnutls.c ? src/sunrpc/svc_gnutls.h ? src/sunrpc/svc_tcp2.c ? src/sunrpc/svc_tcp2.h Index: config.h.in =================================================================== RCS file: /data/cvs/libvirt/config.h.in,v retrieving revision 1.7 diff -u -r1.7 config.h.in --- config.h.in 31 Oct 2006 10:25:13 -0000 1.7 +++ config.h.in 30 Jan 2007 17:22:07 -0000 @@ -28,6 +28,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `gnutls' library (-lgnutls). */ +#undef HAVE_LIBGNUTLS + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.52 diff -u -r1.52 configure.in --- configure.in 22 Jan 2007 15:31:00 -0000 1.52 +++ configure.in 30 Jan 2007 17:22:07 -0000 @@ -146,6 +146,11 @@ AC_SUBST(LIBXML_CONFIG) AC_SUBST(LIBXML_MIN_VERSION) +dnl GnuTLS library +AC_CHECK_LIB(gnutls, gnutls_handshake, + [], + [AC_MSG_ERROR([gnutls library not found])]) + dnl virsh libraries AC_CHECK_LIB(curses, initscr, [VIRSH_LIBS="$VIRSH_LIBS -lcurses"], Index: include/libvirt/virterror.h =================================================================== RCS file: /data/cvs/libvirt/include/libvirt/virterror.h,v retrieving revision 1.17 diff -u -r1.17 virterror.h --- include/libvirt/virterror.h 8 Nov 2006 16:55:20 -0000 1.17 +++ include/libvirt/virterror.h 30 Jan 2007 17:22:07 -0000 @@ -46,7 +46,8 @@ VIR_FROM_DOM, /* Error when operating on a domain */ VIR_FROM_RPC, /* Error in the XML-RPC code */ VIR_FROM_PROXY, /* Error in the proxy code */ - VIR_FROM_CONF /* Error in the configuration file handling */ + VIR_FROM_CONF, /* Error in the configuration file handling */ + VIR_FROM_REMOTE /* Error from remote driver */ } virErrorDomain; @@ -113,7 +114,8 @@ VIR_ERR_PARSE_FAILED, /* failed to parse a conf file */ VIR_ERR_CONF_SYNTAX, /* failed to parse the syntax of a conf file */ VIR_ERR_WRITE_FAILED, /* failed to write a conf file */ - VIR_ERR_XML_DETAIL /* detail of an XML error */ + VIR_ERR_XML_DETAIL, /* detail of an XML error */ + VIR_ERR_RPC /* some sort of RPC error */ } virErrorNumber; /** Index: src/.cvsignore =================================================================== RCS file: /data/cvs/libvirt/src/.cvsignore,v retrieving revision 1.2 diff -u -r1.2 .cvsignore --- src/.cvsignore 5 Jul 2006 21:52:52 -0000 1.2 +++ src/.cvsignore 30 Jan 2007 17:22:07 -0000 @@ -5,3 +5,8 @@ *.lo *.la virsh +libvirtd +remote_rpc_clnt.c +remote_rpc_svc.c +remote_rpc_xdr.c +remote_rpc.h \ No newline at end of file Index: src/Makefile.am =================================================================== RCS file: /data/cvs/libvirt/src/Makefile.am,v retrieving revision 1.31 diff -u -r1.31 Makefile.am --- src/Makefile.am 26 Jan 2007 11:54:29 -0000 1.31 +++ src/Makefile.am 30 Jan 2007 17:22:07 -0000 @@ -28,15 +28,41 @@ driver.h \ proxy_internal.c proxy_internal.h \ conf.c conf.h \ - xm_internal.c xm_internal.h + xm_internal.c xm_internal.h \ + sunrpc/create_xid.c remote_rpc_xdr.c \ + remote_rpc_clnt.c remote_rpc.h \ + sunrpc/clnt_ext.h sunrpc/clnt_gnutls.h \ + sunrpc/clnt_tcp2.h sunrpc/clnt_ext.c \ + sunrpc/clnt_gnutls.c sunrpc/clnt_tcp2.c \ + remote_internal.c remote_internal.h bin_PROGRAMS = virsh +sbin_PROGRAMS = libvirtd virsh_SOURCES = virsh.c console.c console.h virsh_LDFLAGS = virsh_DEPENDENCIES = $(DEPS) virsh_LDADD = $(LDADDS) $(VIRSH_LIBS) +libvirtd_SOURCES = \ + remote_rpc_svc.c \ + sunrpc/svc_gnutls.c sunrpc/svc_gnutls.h \ + sunrpc/svc_tcp2.c sunrpc/svc_tcp2.h \ + libvirtd.c +libvirtd_LDFLAGS = +libvirtd_DEPENDENCIES = $(DEPS) +libvirtd_LDADD = $(LDADDS) remote_rpc_xdr.o + +# Build client and server stubs. +# 'rpcgen' program comes with glibc. +# This is convoluted because we need to build the server stubs +# without main() (-m option), but you can't just do that in a +# simple way. +remote_rpc_clnt.c remote_rpc.h remote_rpc_svc.c remote_rpc_xdr.c: remote_rpc.x + rpcgen remote_rpc.x + rm -f remote_rpc_svc.c + rpcgen -m remote_rpc.x > remote_rpc_svc.c + # # target to ease building test programs # Index: src/driver.h =================================================================== RCS file: /data/cvs/libvirt/src/driver.h,v retrieving revision 1.16 diff -u -r1.16 driver.h --- src/driver.h 22 Jan 2007 16:21:27 -0000 1.16 +++ src/driver.h 30 Jan 2007 17:22:07 -0000 @@ -22,7 +22,8 @@ VIR_DRV_XEN_DAEMON = 3, VIR_DRV_TEST = 4, VIR_DRV_XEN_PROXY = 5, - VIR_DRV_XEN_XM = 6 + VIR_DRV_XEN_XM = 6, + VIR_DRV_REMOTE = 7 } virDrvNo; Index: src/internal.h =================================================================== RCS file: /data/cvs/libvirt/src/internal.h,v retrieving revision 1.28 diff -u -r1.28 internal.h --- src/internal.h 23 Jan 2007 14:39:45 -0000 1.28 +++ src/internal.h 30 Jan 2007 17:22:07 -0000 @@ -117,6 +117,13 @@ struct sockaddr_un addr_un; /* the unix address */ struct sockaddr_in addr_in; /* the inet address */ + /* driver private data + * (Ought to replace the above ad-hoc Xen data, IMHO anyway. + * Currently only the 'remote' driver uses this. + * - RWMJ). + */ + void *private; + /* error stuff */ virError err; /* the last error */ virErrorFunc handler; /* associated handlet */ Index: src/libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.53 diff -u -r1.53 libvirt.c --- src/libvirt.c 23 Jan 2007 14:39:45 -0000 1.53 +++ src/libvirt.c 30 Jan 2007 17:22:09 -0000 @@ -30,6 +30,7 @@ #include "xs_internal.h" #include "xm_internal.h" #include "proxy_internal.h" +#include "remote_internal.h" #include "xml.h" #include "test.h" @@ -79,6 +80,7 @@ xenStoreRegister(); xenXMRegister(); testRegister(); + remoteRegister (); return(0); } Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.47 diff -u -r1.47 virsh.c --- src/virsh.c 28 Jan 2007 19:47:36 -0000 1.47 +++ src/virsh.c 30 Jan 2007 17:22:10 -0000 @@ -2760,7 +2760,7 @@ end = end ? : argc; /* standard (non-command) options */ - while ((arg = getopt_long(end, argv, "d:hqtcv", opt, &idx)) != -1) { + while ((arg = getopt_long(end, argv, "d:hqtc:v", opt, &idx)) != -1) { switch (arg) { case 'd': ctl->debug = atoi(optarg); Index: src/virterror.c =================================================================== RCS file: /data/cvs/libvirt/src/virterror.c,v retrieving revision 1.19 diff -u -r1.19 virterror.c --- src/virterror.c 8 Nov 2006 16:55:20 -0000 1.19 +++ src/virterror.c 30 Jan 2007 17:22:10 -0000 @@ -268,6 +268,9 @@ case VIR_FROM_RPC: dom = "XML-RPC "; break; + case VIR_FROM_REMOTE: + dom = "Remote "; + break; } if ((err->dom != NULL) && (err->code != VIR_ERR_INVALID_DOMAIN)) { domain = err->dom->name; @@ -582,6 +585,12 @@ else errmsg = "%s"; break; + case VIR_ERR_RPC: + if (info == NULL) + errmsg = _("RPC error"); + else + errmsg = "%s"; + break; } return (errmsg); } --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/libvirtd.c 2007-01-30 16:58:42.000000000 +0000 @@ -0,0 +1,257 @@ +/* + * libvirtd: This is a small server to be used in conjunction with + * the "remote" driver (remote_internal.c). + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <malloc.h> +#include <time.h> +#include <rpc/rpc.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netdb.h> +#include <errno.h> +#include <gnutls/gnutls.h> + +#include "sunrpc/svc_gnutls.h" +#include "sunrpc/svc_tcp2.h" +#include "remote_internal.h" +#include "remote_rpc.h" + +// XXX Replace with variables from a configuration file +// XXX TCP services should be disabled by default +#define listen_tls 1 +#define listen_tcp 1 +#define listen_unix 1 + +// XXX Still to decide where these certificates should be located. +#define KEYFILE "newkey.pem" +#define CERTFILE "newcert.pem" +#define CAFILE "demoCA/cacert.pem" +//#define CRLFILE "crl.pem" + +// This is autogenerated, in remote_rpc_svc.c +extern void libvirtremote_1 (struct svc_req *rqstp, register SVCXPRT *transp); + +/*----------------------------------------------------------------------*/ +/* Server side of the remote procedure calls. */ + +int * +remote_rpc_open_1_svc (char **name, + struct svc_req *req __attribute__((unused))) +{ + static int retcode = 0; + + // Before this is going to work, we will have to assign a cookie + // to each caller to represent their server-side virConnectPtr. + // XXX XXX XXX + //virConnectOpen (name); + + printf ("libvirtd: open: name = %s\n", *name); + return &retcode; +} + +int * +remote_rpc_close_1_svc (void *p __attribute__((unused)), + struct svc_req *req __attribute__((unused))) +{ + static int retcode = 0; + + printf ("libvirtd: close\n"); + return &retcode; +} + +char ** +remote_rpc_type_1_svc (void *p __attribute__((unused)), + struct svc_req *req __attribute__((unused))) +{ + static char *dummy = "remote"; + + printf ("libvirtd: type\n"); + return &dummy; +} + +struct version_ret * +remote_rpc_version_1_svc (void *p __attribute__((unused)), + struct svc_req *req __attribute__((unused))) +{ + static struct version_ret ret = { .retcode = 0, .hvVer = 1000000 }; + + printf ("libvirtd: version\n"); + return &ret; +} + +/*----------------------------------------------------------------------*/ +/* Main function. */ + +static gnutls_certificate_credentials_t x509_cred; +static gnutls_dh_params_t dh_params; + +static void generate_dh_params (void); +static int make_sockets (int *fds, int max_fds, int *nfds_r, + const char *service); + +int +main (int argc, char *argv[]) +{ + if (!listen_tls || !listen_tcp || !listen_unix) { + fprintf (stderr, "libvirtd: you need to enable at least one service in the configuration file\n"); + exit (1); + } + + if (listen_tls) { + /* Initialise GnuTLS. */ + gnutls_global_init (); + + gnutls_certificate_allocate_credentials (&x509_cred); + gnutls_certificate_set_x509_trust_file (x509_cred, CAFILE, + GNUTLS_X509_FMT_PEM); + + // gnutls_certificate_set_x509_crl_file (x509_cred, CRLFILE, + // GNUTLS_X509_FMT_PEM); + + gnutls_certificate_set_x509_key_file (x509_cred, CERTFILE, KEYFILE, + GNUTLS_X509_FMT_PEM); + + generate_dh_params (); + gnutls_certificate_set_dh_params (x509_cred, dh_params); + + int fds[2]; + int nfds = 0; + if (make_sockets (fds, 2, &nfds, LIBVIRTD_GNUTLS_PORT) == -1) + exit (1); + + int i; + for (i = 0; i < nfds; ++i) { + SVCXPRT *transp = svcgnutls_create (fds[i], 0, 0, x509_cred); + if (!transp) { + fprintf (stderr, "libvirtd: cannot create TLS service\n"); + exit (1); + } + + /* Because final arg is 0, this will not register with portmap. */ + if (!svc_register (transp, LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, + libvirtremote_1, 0)) { + fprintf (stderr, "libvirtd: unable to register (LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, 0)\n"); + exit (1); + } + } + } + + if (listen_tcp) { + int fds[2]; + int nfds = 0; + if (make_sockets (fds, 2, &nfds, LIBVIRTD_TCP_PORT) == -1) + exit (1); + + int i; + for (i = 0; i < nfds; ++i) { + SVCXPRT *transp = svctcp2_create (fds[i], 0, 0); + if (!transp) { + fprintf (stderr, "libvirtd: cannot create TCP service\n"); + exit (1); + } + + /* Because final arg is 0, this will not register with portmap. */ + if (!svc_register (transp, LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, + libvirtremote_1, 0)) { + fprintf (stderr, "libvirtd: unable to register (LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, 0)\n"); + exit (1); + } + } + } + + if (listen_unix) { + char *sockname = LIBVIRTD_UNIX_SOCKET; + int sock = RPC_ANYSOCK; + SVCXPRT *transp = svcunix_create (sock, 0, 0, sockname); + if (!transp) { + fprintf (stderr, "libvirtd: cannot create Unix domain socket service\n"); + exit (1); + } + + /* Because final arg is 0, this will not register with portmap. */ + if (!svc_register (transp, LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, + libvirtremote_1, 0)) { + fprintf (stderr, "libvirtd: unable to register (LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, 0)\n"); + exit (1); + } + } + + svc_run (); + fprintf (stderr, "libvirtd: svc_run should not return\n"); + exit (1); +} + +// XXX DH_BITS has to match the value define in svc_gnutls.c +#define DH_BITS 1024 + +static void +generate_dh_params (void) +{ + /* Generate Diffie Hellman parameters - for use with DHE + * kx algorithms. These should be discarded and regenerated + * once a day, once a week or once a month. Depending on the + * security requirements. + */ + gnutls_dh_params_init (&dh_params); + gnutls_dh_params_generate2 (dh_params, DH_BITS); +} + +// See: http://people.redhat.com/drepper/userapi-ipv6.html +static int +make_sockets (int *fds, int max_fds, int *nfds_r, const char *service) +{ + struct addrinfo *ai; + struct addrinfo hints; + memset (&hints, 0, sizeof hints); + hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; + hints.ai_socktype = SOCK_STREAM; + + int e = getaddrinfo (NULL, service, &hints, &ai); + if (e != 0) { + fprintf (stderr, "getaddrinfo: %s\n", gai_strerror (e)); + return -1; + } + + struct addrinfo *runp = ai; + while (runp && *nfds_r < max_fds) { + fds[*nfds_r] = socket (runp->ai_family, runp->ai_socktype, + runp->ai_protocol); + if (fds[*nfds_r] == -1) { + perror ("socket"); + return -1; + } + + int opt = 1; + setsockopt (fds[*nfds_r], SOL_SOCKET, SO_REUSEADDR, &opt, sizeof opt); + + if (bind (fds[*nfds_r], runp->ai_addr, runp->ai_addrlen) == -1) { + if (errno != EADDRINUSE) { + perror ("bind"); + return -1; + } + close (fds[*nfds_r]); + } + else { + if (listen (fds[*nfds_r], SOMAXCONN) == -1) { + perror ("listen"); + return -1; + } + ++*nfds_r; + } + runp = runp->ai_next; + } + + freeaddrinfo (ai); + + return 0; +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/remote_internal.c 2007-01-30 16:31:59.000000000 +0000 @@ -0,0 +1,663 @@ +/* + * remote_internal.c: driver to provide access to libvirtd running + * on a remote machine. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +/* Architecture and notes: + * + * virConnectOpen ("remote:....") invokes this driver. Depending + * on the exact contents of the ellipsis "...." in the name string + * we will try some method to connect to a libvirtd daemon, running + * on a remote machine (or sometimes running on the local machine). + * + * All other vir* calls made on this connection are forwarded + * to the libvirtd daemon which carries out the requested action. + * So for example if you call virDomainCreateLinux, then the + * domain gets created on the remote machine, and virConnectListDomains + * lists domains running on the remote machine. + * + * Connections can be authenticated and encrypted -- it depends + * on the transport selected by the name string. + * + * The current implementation uses SunRPC layered over one of: + * - GnuTLS (an SSL/TLS library providing enterprise-level + * authentication and encryption) + * - a local Unix domain socket + * - ssh or another external program such as rsh + * - a plain TCP socket (unencrypted, not recommended for production) + * + * See http://et.redhat.com/~rjones/secure_rpc for an insight into + * the thinking that went into the selection of SunRPC. In + * the future we may use a different RPC system - for example + * XML-RPC would be a logical choice - so for now you should regard + * the protocol used as private and subject to change in future + * versions of libvirt without notice. + * + * The name string selects the transport to use and the type of + * virtualisation at the remote end. The general format is: + * + * "remote:<protocol>:<path> var=value var=value ..." + * + * Some examples: + * + * "remote:unix:/var/run/libvirtd/socket" + * "remote:tls:myxenserver" + * "remote:ssh:myserver name=qemud" + * "remote:ssh:myserver command=/opt/openssh/bin/ssh" + * + * The <protocol> is one of: tls, unix, ssh, ext or tcp. + * The <path> is protocol specific: + * + * Protocol Path-format + * ----------------------------------------- + * tls hostname[:port] + * unix Path to local socket + * ssh hostname[:port] + * ext Name or path of external program + * tcp hostname[:port] + * + * For tls, the default port is 16514. For tcp, the default port is + * 16509 (but note that tcp is almost never enabled because it is + * insecure - it's only there for testing). + * + * For ssh: The default port for ssh is 22. You should configure ssh + * so that it doesn't ask for a password (eg. using ssh-agent). The + * remote server should have a recent version of the the netcat program + * installed as 'nc', and the remote libvirtd must be configured to + * listen on a Unix domain socket. The following full command is run: + * ssh -p $port $hostname nc -U /var/run/libvirtd/socket + * + * For ext: Only the command you specify is run. It is up to you to + * write this command so that it somehow makes a connection to a + * remote libvirtd, and passes input and output over its stdin/stdout. + * + * The var=value pairs provide optional extra information: + * + * Variable Protocols Meaning + * ----------------------------------------- + * name (all) Name used in remote virConnectOpen + * (default is NULL). + * command ssh Name or path of external program (instead + * of "ssh"). + * + * The value is %-escaped (just like URL encoding), so if you want it + * to contain a literal space use "%20" or "+", if you want it to have + * a literal + character use "%2b", and for a literal % character use "%25". + * + * To provide some forwards compatibility, variables which are not + * understood are ignored (but a warning is printed on stderr). + * + * Several shorthand syntaxes are available: + * + * "remote:/var/run/libvirtd/socket" connect to Unix domain socket + * "remote://server" connect to TLS socket on server + * "remote://server:9000" connect to TLS server port 9000 + * + * For the details of the implementation of SunRPC over GnuTLS, etc. + * please see http://et.redhat.com/~rjones/secure_rpc which contains + * simple code samples which will allow you to understand what's + * going on here. + * + * - Richard Jones <rjones(a)redhat.com> + */ + +#define _GNU_SOURCE + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <rpc/rpc.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <netdb.h> +#include <assert.h> +#include <gnutls/gnutls.h> + +#include "sunrpc/clnt_ext.h" +#include "sunrpc/clnt_gnutls.h" +#include "sunrpc/clnt_tcp2.h" + +#include "internal.h" +#include "driver.h" +#include "remote_internal.h" +#include "remote_rpc.h" + +#define VERSION 1 /* Doesn't really mean anything. */ +#define DEBUG 1 /* Enable verbose messages on stderr. */ + +#define MAGIC 999 /* private_data->magic if OK */ +#define DEAD 998 /* private_data->magic if dead/closed */ + +struct private_data { + int magic; /* Should be MAGIC or DEAD. */ + int sock; /* Socket. */ + CLIENT *cl; /* SunRPC client. */ +}; + +#define GET_PRIVATE(conn,retcode) \ + struct private_data *private = (struct private_data *) (conn)->private; \ + assert (private); \ + if (private->magic == DEAD) { \ + error (conn, VIR_ERR_INVALID_ARG, \ + "tried to use a closed or uninitialised handle"); \ + return (retcode); \ + } \ + assert (private->magic == MAGIC) + +#define CAFILE "demoCA/cacert.pem" /* XXX */ + +static gnutls_certificate_credentials_t xcred; + +static void +initialise_gnutls (void) +{ + static int initialised = 0; + + if (initialised) return; + + gnutls_global_init (); + + /* X509 stuff */ + gnutls_certificate_allocate_credentials (&xcred); + + /* sets the trusted cas file + */ + gnutls_certificate_set_x509_trust_file (xcred, CAFILE, GNUTLS_X509_FMT_PEM); + + initialised = 1; +} + +enum protocol { + proto_unknown, + proto_tls, + proto_unix, + proto_ssh, + proto_ext, + proto_tcp +}; + +#define whitespace " \t\n" + +static char *unescape (const char *); +static int parse_hostname_port (const char *, char **hostname_r, + char **port_r, const char *default_port); +static void error (virConnectPtr conn, virErrorNumber code, const char *info); + +static int +remote_open (virConnectPtr conn, const char *name, + int flags __attribute__((unused))) +{ + int retcode = -1; /* Return code from this function. */ + enum protocol proto = proto_unknown; + char *path = 0; /* or hostname */ + char *port = 0; + char *remote_name = 0; /* Name to use at remote end of connection. */ + char *command = 0; /* External command. */ + char **cmd_argv = 0; /* External command argv[] array. */ + struct private_data private = { .magic = DEAD }; + /* Private data - copied to conn->private at the + * end of this function. + */ + + initialise_gnutls (); + + if (strncasecmp (name, "remote:", 7) != 0) + return -1; /* Not for me. */ + + /* Split the name at whitespace and parse it. */ + const char *p; + for (p = name; *p;) { + size_t len = strcspn (p, whitespace); + char *token = strndup (p, len); +#if DEBUG + fprintf (stderr, "token = %s\n", token); +#endif + if (p == name) { + /* First parameter is remote:protocol:path or a shortcut. */ + if (strncasecmp (token, "remote://", 9) == 0) { + proto = proto_tls; + if (parse_hostname_port (token+9, &path, &port, LIBVIRTD_GNUTLS_PORT) + == -1) { + error (conn, VIR_ERR_INVALID_ARG, + "remote_open: cannot parse port number"); + goto failed; + } + } else if (strncasecmp (token, "remote:/", 8) == 0) { + proto = proto_unix; + path = strdup (token+7); // include the initial slash + } else if (strncasecmp (token, "remote:tls:", 11) == 0) { + proto = proto_tls; + if (parse_hostname_port (token+11, &path, &port, LIBVIRTD_GNUTLS_PORT) + == -1) { + error (conn, VIR_ERR_INVALID_ARG, + "remote_open: cannot parse port number"); + goto failed; + } + } else if (strncasecmp (token, "remote:unix:", 12) == 0) { + proto = proto_unix; + path = strdup (token+12); + } else if (strncasecmp (token, "remote:ssh:", 11) == 0) { + proto = proto_ssh; + if (parse_hostname_port (token+11, &path, &port, "ssh") == -1) { + error (conn, VIR_ERR_INVALID_ARG, + "remote_open: cannot parse port number"); + goto failed; + } + command = strdup ("ssh"); + } else if (strncasecmp (token, "remote:ext:", 11) == 0) { + proto = proto_ext; + command = strdup (token+11); + } else if (strncasecmp (token, "remote:tcp:", 11) == 0) { + proto = proto_tcp; + if (parse_hostname_port (token+11, &path, &port, LIBVIRTD_TCP_PORT) + == -1) { + error (conn, VIR_ERR_INVALID_ARG, + "remote_open: cannot parse port number"); + goto failed; + } + } else { + error (conn, VIR_ERR_INVALID_ARG, + "remote_open: expecting 'remote:protocol:path' - please read the manual for the remote driver / libvirtd"); + goto failed; + } + } else { + /* Variable=value. Value is URL-escaped. */ + char *value = strchr (token, '='); + if (!value) { + error (conn, VIR_ERR_INVALID_ARG, + "remote_open: expecting 'variable=value'"); + goto failed; + } + *value++ = '\0'; /* So now token = variable, value = value. */ + /* Unescape value - this always makes a copy. */ + value = unescape (value); + + if (strcasecmp (token, "name") == 0) { + if (remote_name) { + free (remote_name); + fprintf (stderr, "libvir: warning: multiple name parameters. All but final will be ignored.\n"); + } + remote_name = value; + } else if (strcasecmp (token, "command") == 0) { + if (command) free (command); + command = value; + } else + /* For forwards compatibility, just warn about variables we + * don't understand. + */ + fprintf (stderr, "libvir: warning: variable '%s' ignored\n", token); + } + + free (token); + + /* Skip to next token. */ + p += len; + p += strspn (p, whitespace); + } + + /* Connect to the remote service. */ + switch (proto) { + case proto_unknown: + abort (); /* Internal error in this function. */ + + case proto_tls: + case proto_tcp: { + // http://people.redhat.com/drepper/userapi-ipv6.html + struct addrinfo *res, *r; + struct addrinfo hints; + memset (&hints, 0, sizeof hints); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG; + int e = getaddrinfo (path, port, &hints, &res); + if (e != 0) { + error (conn, VIR_ERR_INVALID_ARG, gai_strerror (e)); + goto failed; + } + + /* Try to connect to each returned address in turn. */ + for (r = res; r; r = r->ai_next) { + private.sock = RPC_ANYSOCK; + private.cl = + proto == proto_tls + ? clntgnutls_create (r->ai_family, r->ai_addr, r->ai_addrlen, xcred, + LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, + &private.sock, 0, 0) + : clnttcp2_create (r->ai_family, r->ai_addr, r->ai_addrlen, + LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, + &private.sock, 0, 0); + if (private.cl) + goto tcp_connected; + } + + freeaddrinfo (res); + error (conn, VIR_ERR_RPC, + clnt_spcreateerror ("could not create SunRPC client")); + goto failed; + + tcp_connected: + freeaddrinfo (res); + + // NB. All versioning is done by SunRPC so we don't need to worry + // that we are connected to an incompatible daemon. + break; + } + + case proto_unix: { + // 108 is hard-coded into the header files as well. +#define UNIX_PATH_MAX 108 + struct sockaddr_un addr; + memset (&addr, 0, sizeof addr); + addr.sun_family = AF_UNIX; + strncpy (addr.sun_path, path, UNIX_PATH_MAX); + + private.sock = RPC_ANYSOCK; + private.cl = + clntunix_create (&addr, + LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, + &private.sock, 0, 0); + if (!private.cl) { + error (conn, VIR_ERR_RPC, + clnt_spcreateerror ("could not create SunRPC client")); + goto failed; + } + + break; + } + + case proto_ssh: + // Generate the final command argv[] array. + // ssh -p $port $hostname nc -U $socket [NULL] + cmd_argv = malloc (8 * sizeof (char *)); + cmd_argv[0] = strdup (command); + cmd_argv[1] = strdup ("-p"); + cmd_argv[2] = strdup (port); + cmd_argv[3] = strdup (path); + cmd_argv[4] = strdup ("nc"); + cmd_argv[5] = strdup ("-U"); + cmd_argv[6] = strdup (LIBVIRTD_UNIX_SOCKET); + cmd_argv[7] = 0; + /*FALLTHROUGH*/ + case proto_ext: + private.sock = RPC_ANYSOCK; + private.cl = + clntext_create (command, cmd_argv, + LIBVIRTREMOTE, LIBVIRTREMOTE_VERS1, + &private.sock, 0, 0); + if (!private.cl) { + error (conn, VIR_ERR_RPC, + clnt_spcreateerror ("could not create SunRPC client")); + goto failed; + } + } + + // Send name (make the actual driver open RPC). + int *retcode_ptr = remote_rpc_open_1 (&remote_name, private.cl); + if (!retcode_ptr || *retcode_ptr == -1) { + error (conn, VIR_ERR_RPC, + clnt_sperror (private.cl, "remote_rpc_open")); + clnt_destroy (private.cl); + goto failed; + } + + conn->private = malloc (sizeof private); + if (!conn->private) { + error (conn, VIR_ERR_NO_MEMORY, "malloc"); + clnt_destroy (private.cl); + goto failed; + } + private.magic = MAGIC; + memcpy (conn->private, &private, sizeof private); + + retcode = 0; /* Success. */ + /*FALLTHROUGH*/ + + failed: + if (path) free (path); + if (port) free (port); + if (remote_name) free (remote_name); + if (command) free (command); + if (cmd_argv) { + char **a = cmd_argv; + while (*a) { free (*a); a++; } + free (cmd_argv); + } + + return retcode; +} + +/* Un-%-escape the argument string. Note that this always makes + * a copy, and that is intentional. + */ +static inline int +xdigit (char c) +{ + switch (c) { + case '0'...'9': return c - '0'; + case 'a'...'f': return c - 'a' + 10; + case 'A'...'F': return c - 'A' + 10; + default: return -1; + } +} + +static char * +unescape (const char *str) +{ + // Returned string will always be same length or shorter than input. + int n = strlen (str); + + char *ret = malloc (n+1); + if (ret == 0) return 0; // although _I_ think we should abort(). + + int i; + char *p = ret; + for (i = 0; i < n; ++i) { + if (str[i] == '+') { + *p++ = ' '; + } else if (str[i] == '%') { + if (i+2 < n) { + int c1 = xdigit (str[i+1]), c2 = xdigit (str[i+2]); + if (c1 == -1 || c2 == -1) { + fprintf (stderr, "remote_open: incorrect %%-hex sequence in name\n"); + return 0; + } + *p++ = xdigit (c1) << 4 | xdigit (c2); + } else { + fprintf (stderr, "remote_open: short %%-hex sequence in name\n"); + return 0; + } + } else + *p++ = str[i]; + } + *p = '\0'; + return ret; +} + +/* Parse a string which may be either "hostname" or "hostname:port". + * The hostname may contain colons (eg. if it's an IPv6 name). + * Note that this always makes a copy of the hostname and port number, + * and that is intentional. + */ +static int +parse_hostname_port (const char *str, char **hostname_r, + char **port_r, const char *default_port) +{ + char *p = strrchr (str, ':'); + if (p) { + *hostname_r = strndup (str, p-str); + *port_r = strdup (p+1); + } else { + // No :port, so just copy the hostname. + *hostname_r = strdup (str); + *port_r = strdup (default_port); + } + return 0; +} + +static int +remote_close (virConnectPtr conn) +{ + GET_PRIVATE (conn, -1); + + int *retcode = remote_rpc_close_1 (NULL, private->cl); + if (retcode == 0) { + error (conn, VIR_ERR_RPC, + clnt_sperror (private->cl, "remote_rpc_open")); + return -1; + } + if (*retcode == -1) return -1; + + // XXX freeres + + // NB. clnt_destroy should close the socket (private->sock) too. + clnt_destroy (private->cl); + // Force errors if anyone tries to reuse the closed connection. + private->magic = DEAD; + + return *retcode; +} + +/* Remote_open and remote_close functions above are the complex ones. The + * rest just shuffle arguments and pass them along to the remote libvirtd. + */ + +// Should we return our local type (ie. "remote"), or the type +// of the remote HV, or the type of the remote HV + some flag? +// I took the view that we should just transparently shuffle. +static const char * +remote_type (virConnectPtr conn) +{ + GET_PRIVATE (conn, NULL); + + char **type = remote_rpc_type_1 (NULL, private->cl); + if (type == 0) { + error (conn, VIR_ERR_RPC, + clnt_sperror (private->cl, "remote_rpc_open")); + return NULL; + } + + // XXX freeres + + return *type; +} + +static int +remote_version (virConnectPtr conn, unsigned long *hvVer) +{ + GET_PRIVATE (conn, -1); + + struct version_ret *ret = remote_rpc_version_1 (NULL, private->cl); + if (ret == 0) { + error (conn, VIR_ERR_RPC, + clnt_sperror (private->cl, "remote_rpc_open")); + return -1; + } + + // XXX freeres + + if (ret->retcode == -1) return -1; + *hvVer = ret->hvVer; + return ret->retcode; +} + +/* + .nodeGetInfo = remote_nodeGetInfo, + .listDomains = remote_listDomains, + .numOfDomains = remote_numOfDomains, + .domainCreateLinux = remote_domainCreateLinux, + .domainLookupByID = remote_domainLookupByID, + .domainLookupByUUID = remote_domainLookupByUUID, + .domainLookupByName = remote_domainLookupByName, + .domainSuspend = remote_domainSuspend, + .domainResume = remote_domainResume, + .domainShutdown = remote_domainShutdown, + .domainReboot = remote_domainReboot, + .domainDestroy = remote_domainDestroy, + .domainGetOSType = remote_domainGetOSType, + .domainGetMaxMemory = remote_domainGetMaxMemory, + .domainSetMaxMemory = remote_domainSetMaxMemory, + .domainSetMemory = remote_domainSetMemory, + .domainGetInfo = remote_domainGetInfo, + .domainSave = remote_domainSave, + .domainRestore = remote_domainRestore, + .domainCoreDump = remote_domainCoreDump, + .domainSetVcpus = remote_domainSetVcpus, + .domainPinVcpu = remote_domainPinVcpu, + .domainGetVcpus = remote_domainGetVcpus, + .domainDumpXML = remote_domainDumpXML, + .listDefinedDomains = remote_listDefinedDomains, + .numOfDefinedDomains = remote_numOfDefinedDomains, + .domainCreate = remote_domainCreate, + .domainDefineXML = remote_domainDefineXML, + .domainUndefine = remote_domainUndefine, + .domainAttachDevice = remote_domainAttachDevice, + .domainDetachDevice = remote_domainDetachDevice, +*/ + +/* Error handling. This error handling is on crack. */ +static void +error (virConnectPtr conn, virErrorNumber code, const char *info) +{ + const char *errmsg; + + errmsg = __virErrorMsg (code, info); + __virRaiseError (conn, NULL, VIR_FROM_REMOTE, + code, VIR_ERR_ERROR, errmsg, info, NULL, 0, 0, + errmsg, info); +} + +static virDriver driver = { + .no = VIR_DRV_REMOTE, + .name = "remote", + .ver = VERSION, + //.init = remote_init, + .open = remote_open, + .close = remote_close, + .type = remote_type, + .version = remote_version, +#if 0 + .nodeGetInfo = remote_nodeGetInfo, + .listDomains = remote_listDomains, + .numOfDomains = remote_numOfDomains, + .domainCreateLinux = remote_domainCreateLinux, + .domainLookupByID = remote_domainLookupByID, + .domainLookupByUUID = remote_domainLookupByUUID, + .domainLookupByName = remote_domainLookupByName, + .domainSuspend = remote_domainSuspend, + .domainResume = remote_domainResume, + .domainShutdown = remote_domainShutdown, + .domainReboot = remote_domainReboot, + .domainDestroy = remote_domainDestroy, + .domainGetOSType = remote_domainGetOSType, + .domainGetMaxMemory = remote_domainGetMaxMemory, + .domainSetMaxMemory = remote_domainSetMaxMemory, + .domainSetMemory = remote_domainSetMemory, + .domainGetInfo = remote_domainGetInfo, + .domainSave = remote_domainSave, + .domainRestore = remote_domainRestore, + .domainCoreDump = remote_domainCoreDump, + .domainSetVcpus = remote_domainSetVcpus, + .domainPinVcpu = remote_domainPinVcpu, + .domainGetVcpus = remote_domainGetVcpus, + .domainDumpXML = remote_domainDumpXML, + .listDefinedDomains = remote_listDefinedDomains, + .numOfDefinedDomains = remote_numOfDefinedDomains, + .domainCreate = remote_domainCreate, + .domainDefineXML = remote_domainDefineXML, + .domainUndefine = remote_domainUndefine, + .domainAttachDevice = remote_domainAttachDevice, + .domainDetachDevice = remote_domainDetachDevice, +#endif +}; + +/* Register driver. */ +void +remoteRegister (void) +{ + virRegisterDriver (&driver); +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/remote_internal.h 2007-01-30 16:21:19.000000000 +0000 @@ -0,0 +1,34 @@ +/* + * remote_internal.h: driver to provide access to libvirtd running + * on a remote machine. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +#ifndef __VIR_REMOTE_INTERNAL_H__ +#define __VIR_REMOTE_INTERNAL_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +void remoteRegister (void); + +/* The port numbers are strings because you can also use + * service names here. + */ +#define LIBVIRTD_GNUTLS_PORT "16514" +#define LIBVIRTD_TCP_PORT "16509" + //#define LIBVIRTD_UNIX_SOCKET "/var/run/libvirtd/socket" +#define LIBVIRTD_UNIX_SOCKET "/tmp/socket" // Just for testing + +#ifdef __cplusplus +} +#endif + + +#endif /* __VIR_REMOTE_INTERNAL_H__ */ --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/remote_rpc.x 2007-01-30 13:32:56.000000000 +0000 @@ -0,0 +1,38 @@ +/* -*- C -*- + * remote_rpc.x: Remote procedure call interface for the remote driver. + * Process this file with rpcgen to generate client and server stubs. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +/* Structure returned from remote_rpc_version. */ +struct version_ret { + int retcode; + long hvVer; +}; + +program LIBVIRTREMOTE { + version LIBVIRTREMOTE_VERS1 { + /* XXX The open interface should return a cookie to represent + * the virConnectPtr on the server side. Note also that SunRPC + * is stateless so it's unclear when cookies can be garbage + * collected. + */ + int remote_rpc_open (string) = 1; + int remote_rpc_close (void) = 2; + string remote_rpc_type (void) = 3; + version_ret remote_rpc_version (void) = 4; + + /* etc */ + + } = 1; + /* It doesn't really matter what program number we choose here because + * there will only ever be one "program" listening on the assigned + * TCP port number. Nevertheless, choose one from the Sun private + * space. + */ +} = 0x20008080; --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/README 2007-01-30 16:15:43.000000000 +0000 @@ -0,0 +1,25 @@ +This directory contains modified SunRPC transports. They are based on +the standard transports from glibc 2.5 (in the sunrpc/ directory +there). + +clnt_ext.c + - Fork an external program, eg. ssh. + (Original: clnt_unix.c) + +clnt_gnutls.c + - Modified for IPv6 and GnuTLS support. + (Original: clnt_tcp.c) + +clnt_tcp2.c + - Modified for IPv6 support. + (Original: clnt_tcp.c) + +svc_gnutls.c + - Modified for IPv6 and GnuTLS support. + (Original: svc_tcp.c) + +svc_tcp2.c + - Modified for IPv6 support. + (Original: svc_tcp.c) + +$Id$ \ No newline at end of file --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/clnt_ext.c 2007-01-30 11:48:09.000000000 +0000 @@ -0,0 +1,645 @@ +/* + * clnt_ext.c: SunRPC over an external program. This is a modified version + * of clnt_unix.c from glibc which is written to run over a forked + * external program. + * + * Note that there is no corresponding svc_ext.c. It is expected that + * this client will talk to a remote Unix domain socket (ie. svc_unix.c). + * + * Modifications from glibc-2.5 base by Richard Jones <rjones(a)redhat.com>. + */ + +/* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. + * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ + +/* + * clnt_unix.c, Implements a TCP/IP based, client side RPC. + * + * Copyright (C) 1984, Sun Microsystems, Inc. + * + * TCP based RPC supports 'batched calls'. + * A sequence of calls may be batched-up in a send buffer. The rpc call + * return immediately to the client even though the call was not necessarily + * sent. The batching occurs if the results' xdr routine is NULL (0) AND + * the rpc timeout value is zero (see clnt.h, rpc). + * + * Clients should NOT casually batch calls that in fact return results; that is, + * the server side should be aware that a call is batched and not produce any + * return message. Batched calls that produce many result messages can + * deadlock (netlock) the client and the server.... + * + * Now go hang yourself. + */ + +#include <netdb.h> +#include <errno.h> +#include <stdio.h> +#include <unistd.h> +#include <libintl.h> +#include <rpc/rpc.h> +#include <sys/uio.h> +#include <sys/poll.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <rpc/pmap_clnt.h> +#ifdef USE_IN_LIBIO +# include <wchar.h> +#endif + +#include "clnt_ext.h" + +extern u_long _create_xid (void); + +#define MCALL_MSG_SIZE 24 + +struct ct_data + { + int ct_sock; + bool_t ct_closeit; + struct timeval ct_wait; + bool_t ct_waitset; /* wait set by clnt_control? */ + struct rpc_err ct_error; + char ct_mcall[MCALL_MSG_SIZE]; /* marshalled callmsg */ + u_int ct_mpos; /* pos after marshal */ + XDR ct_xdrs; + int ct_pid; /* Child PID. */ + }; + +static int readunix (char *, char *, int); +static int writeunix (char *, char *, int); + +static enum clnt_stat clntunix_call (CLIENT *, u_long, xdrproc_t, caddr_t, + xdrproc_t, caddr_t, struct timeval); +static void clntunix_abort (void); +static void clntunix_geterr (CLIENT *, struct rpc_err *); +static bool_t clntunix_freeres (CLIENT *, xdrproc_t, caddr_t); +static bool_t clntunix_control (CLIENT *, int, char *); +static void clntunix_destroy (CLIENT *); + +static const struct clnt_ops unix_ops = +{ + clntunix_call, + clntunix_abort, + clntunix_geterr, + clntunix_freeres, + clntunix_destroy, + clntunix_control +}; + +CLIENT * +clntext_create (char *filename, char *argv[], + u_long prog, u_long vers, + int *sockp, u_int sendsz, u_int recvsz) +{ + CLIENT *h; + struct ct_data *ct = (struct ct_data *) mem_alloc (sizeof (*ct)); + struct rpc_msg call_msg; + int len, sv[2]; + + h = (CLIENT *) mem_alloc (sizeof (*h)); + if (h == NULL || ct == NULL) + { + struct rpc_createerr *ce = &get_rpc_createerr (); + (void) fprintf (stderr, "clntext_create: out of memory\n"); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = ENOMEM; + goto fooy; + } + + /* Fork off the external process. Use socketpair to create a private + * (unnamed) Unix domain socket to the child process so we don't have + * to faff around with two file descriptors (a la 'pipe(2)'). + */ + if (*sockp < 0) + { + if (socketpair (PF_UNIX, SOCK_STREAM, 0, sv) == -1) + { + struct rpc_createerr *ce = &get_rpc_createerr (); + (void) fprintf (stderr, "clntext_create: socketpair\n"); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = errno; + goto fooy; + } + + ct->ct_pid = fork (); + if (ct->ct_pid == -1) { + struct rpc_createerr *ce = &get_rpc_createerr (); + (void) fprintf (stderr, "clntext_create: fork\n"); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = errno; + goto fooy; + } else if (ct->ct_pid == 0) { /* Child. */ + close (sv[0]); + // Connect socket (sv[1]) to stdin/stdout. + close (0); + dup (sv[1]); + close (1); + dup (sv[1]); + close (sv[1]); + + // Run the external process. + + if (!argv) { + argv = malloc (2 * sizeof (char *)); + argv[0] = filename; + argv[1] = 0; + } + execvp (filename, argv); + perror (filename); + _exit (1); + } + + /* Parent continues here. */ + close (sv[1]); + *sockp = sv[0]; + ct->ct_closeit = TRUE; + } + else + { + ct->ct_closeit = FALSE; + } + + /* + * Set up private data struct + */ + ct->ct_sock = *sockp; + ct->ct_wait.tv_usec = 0; + ct->ct_waitset = FALSE; + + /* + * Initialize call message + */ + call_msg.rm_xid = _create_xid (); + call_msg.rm_direction = CALL; + call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; + call_msg.rm_call.cb_prog = prog; + call_msg.rm_call.cb_vers = vers; + + /* + * pre-serialize the static part of the call msg and stash it away + */ + xdrmem_create (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, + XDR_ENCODE); + if (!xdr_callhdr (&(ct->ct_xdrs), &call_msg)) + { + if (ct->ct_closeit) + close (*sockp); + goto fooy; + } + ct->ct_mpos = XDR_GETPOS (&(ct->ct_xdrs)); + XDR_DESTROY (&(ct->ct_xdrs)); + + /* + * Create a client handle which uses xdrrec for serialization + * and authnone for authentication. + */ + xdrrec_create (&(ct->ct_xdrs), sendsz, recvsz, + (caddr_t) ct, readunix, writeunix); + h->cl_ops = (struct clnt_ops *) &unix_ops; + h->cl_private = (caddr_t) ct; + h->cl_auth = authnone_create (); + return h; + +fooy: + /* + * Something goofed, free stuff and barf + */ + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); + return (CLIENT *) NULL; +} + +static enum clnt_stat +clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) + CLIENT *h; + u_long proc; + xdrproc_t xdr_args; + caddr_t args_ptr; + xdrproc_t xdr_results; + caddr_t results_ptr; + struct timeval timeout; +{ + struct ct_data *ct = (struct ct_data *) h->cl_private; + XDR *xdrs = &(ct->ct_xdrs); + struct rpc_msg reply_msg; + u_long x_id; + u_int32_t *msg_x_id = (u_int32_t *) (ct->ct_mcall); /* yuk */ + bool_t shipnow; + int refreshes = 2; + + if (!ct->ct_waitset) + { + ct->ct_wait = timeout; + } + + shipnow = + (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0 + && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE; + +call_again: + xdrs->x_op = XDR_ENCODE; + ct->ct_error.re_status = RPC_SUCCESS; + x_id = ntohl (--(*msg_x_id)); + if ((!XDR_PUTBYTES (xdrs, ct->ct_mcall, ct->ct_mpos)) || + (!XDR_PUTLONG (xdrs, (long *) &proc)) || + (!AUTH_MARSHALL (h->cl_auth, xdrs)) || + (!(*xdr_args) (xdrs, args_ptr))) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTENCODEARGS; + (void) xdrrec_endofrecord (xdrs, TRUE); + return ct->ct_error.re_status; + } + if (!xdrrec_endofrecord (xdrs, shipnow)) + return ct->ct_error.re_status = RPC_CANTSEND; + if (!shipnow) + return RPC_SUCCESS; + /* + * Hack to provide rpc-based message passing + */ + if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0) + return ct->ct_error.re_status = RPC_TIMEDOUT; + + + /* + * Keep receiving until we get a valid transaction id + */ + xdrs->x_op = XDR_DECODE; + while (TRUE) + { + reply_msg.acpted_rply.ar_verf = _null_auth; + reply_msg.acpted_rply.ar_results.where = NULL; + reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; + if (!xdrrec_skiprecord (xdrs)) + return ct->ct_error.re_status; + /* now decode and validate the response header */ + if (!xdr_replymsg (xdrs, &reply_msg)) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + continue; + return ct->ct_error.re_status; + } + if (reply_msg.rm_xid == x_id) + break; + } + + /* + * process header + */ + _seterr_reply (&reply_msg, &(ct->ct_error)); + if (ct->ct_error.re_status == RPC_SUCCESS) + { + if (!AUTH_VALIDATE (h->cl_auth, &reply_msg.acpted_rply.ar_verf)) + { + ct->ct_error.re_status = RPC_AUTHERROR; + ct->ct_error.re_why = AUTH_INVALIDRESP; + } + else if (!(*xdr_results) (xdrs, results_ptr)) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTDECODERES; + } + /* free verifier ... */ + if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) + { + xdrs->x_op = XDR_FREE; + (void) xdr_opaque_auth (xdrs, + &(reply_msg.acpted_rply.ar_verf)); + } + } /* end successful completion */ + else + { + /* maybe our credentials need to be refreshed ... */ + if (refreshes-- && AUTH_REFRESH (h->cl_auth)) + goto call_again; + } /* end of unsuccessful completion */ + return ct->ct_error.re_status; +} + +static void +clntunix_geterr (CLIENT *h, struct rpc_err *errp) +{ + struct ct_data *ct = (struct ct_data *) h->cl_private; + + *errp = ct->ct_error; +} + +static bool_t +clntunix_freeres (cl, xdr_res, res_ptr) + CLIENT *cl; + xdrproc_t xdr_res; + caddr_t res_ptr; +{ + struct ct_data *ct = (struct ct_data *) cl->cl_private; + XDR *xdrs = &(ct->ct_xdrs); + + xdrs->x_op = XDR_FREE; + return (*xdr_res) (xdrs, res_ptr); +} + +static void +clntunix_abort () +{ +} + +static bool_t +clntunix_control (CLIENT *cl, int request, char *info) +{ + struct ct_data *ct = (struct ct_data *) cl->cl_private; + + + switch (request) + { + case CLSET_FD_CLOSE: + ct->ct_closeit = TRUE; + break; + case CLSET_FD_NCLOSE: + ct->ct_closeit = FALSE; + break; + case CLSET_TIMEOUT: + ct->ct_wait = *(struct timeval *) info; + break; + case CLGET_TIMEOUT: + *(struct timeval *) info = ct->ct_wait; + break; + case CLGET_FD: + *(int *)info = ct->ct_sock; + break; + case CLGET_XID: + /* + * use the knowledge that xid is the + * first element in the call structure *. + * This will get the xid of the PREVIOUS call + */ + *(u_long *) info = ntohl (*(u_long *)ct->ct_mcall); + break; + case CLSET_XID: + /* This will set the xid of the NEXT call */ + *(u_long *) ct->ct_mcall = htonl (*(u_long *)info - 1); + /* decrement by 1 as clntunix_call() increments once */ + case CLGET_VERS: + /* + * This RELIES on the information that, in the call body, + * the version number field is the fifth field from the + * begining of the RPC header. MUST be changed if the + * call_struct is changed + */ + *(u_long *) info = ntohl (*(u_long *) (ct->ct_mcall + + 4 * BYTES_PER_XDR_UNIT)); + break; + case CLSET_VERS: + *(u_long *) (ct->ct_mcall + 4 * BYTES_PER_XDR_UNIT) + = htonl (*(u_long *) info); + break; + case CLGET_PROG: + /* + * This RELIES on the information that, in the call body, + * the program number field is the field from the + * begining of the RPC header. MUST be changed if the + * call_struct is changed + */ + *(u_long *) info = ntohl (*(u_long *) (ct->ct_mcall + + 3 * BYTES_PER_XDR_UNIT)); + break; + case CLSET_PROG: + *(u_long *) (ct->ct_mcall + 3 * BYTES_PER_XDR_UNIT) + = htonl(*(u_long *) info); + break; + /* The following are only possible with TI-RPC */ + case CLGET_RETRY_TIMEOUT: + case CLSET_RETRY_TIMEOUT: + case CLGET_SVC_ADDR: + case CLSET_SVC_ADDR: + case CLSET_PUSH_TIMOD: + case CLSET_POP_TIMOD: + default: + return FALSE; + } + return TRUE; +} + + +static void +clntunix_destroy (CLIENT *h) +{ + struct ct_data *ct = + (struct ct_data *) h->cl_private; + + if (ct->ct_closeit) + { + (void) close (ct->ct_sock); + } + XDR_DESTROY (&(ct->ct_xdrs)); + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); + + // Wait for child to finish. Print any errors but don't stop. + int status; + if (waitpid (ct->ct_pid, &status, 0) == -1) { + perror ("waitpid"); + return; + } + if (WIFEXITED (status)) { + int s = WEXITSTATUS (status); + if (s != 0) + fprintf (stderr, "clntext_destroy: warning: external command exited with non-zero exit status %d\n", s); + } else if (WIFSIGNALED (status)) { + int s = WTERMSIG (status); + fprintf (stderr, "clntext_destroy: warning: external command died on signal %d\n", s); + } else if (WIFSTOPPED (status)) { + int s = WSTOPSIG (status); + fprintf (stderr, "clntext_destroy: warning: external command stopped on signal %d\n", s); + } +} + +static int +__msgread (int sock, void *data, size_t cnt) +{ + struct iovec iov; + struct msghdr msg; +#ifdef SCM_CREDENTIALS + static char cm[CMSG_SPACE(sizeof (struct ucred))]; +#endif + int len; + + iov.iov_base = data; + iov.iov_len = cnt; + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_name = NULL; + msg.msg_namelen = 0; +#ifdef SCM_CREDENTIALS + msg.msg_control = (caddr_t) &cm; + msg.msg_controllen = CMSG_SPACE(sizeof (struct ucred)); +#endif + msg.msg_flags = 0; + +#ifdef SO_PASSCRED + { + int on = 1; + if (setsockopt (sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on))) + return -1; + } +#endif + + restart: + len = recvmsg (sock, &msg, 0); + if (len >= 0) + { + if (msg.msg_flags & MSG_CTRUNC || len == 0) + return 0; + else + return len; + } + if (errno == EINTR) + goto restart; + return -1; +} + +static int +__msgwrite (int sock, void *data, size_t cnt) +{ +#ifndef SCM_CREDENTIALS + /* We cannot implement this reliably. */ + __set_errno (ENOSYS); + return -1; +#else + struct iovec iov; + struct msghdr msg; + struct cmsghdr *cmsg = alloca (CMSG_SPACE(sizeof (struct ucred))); + struct ucred cred; + int len; + + /* XXX I'm not sure, if gete?id() is always correct, or if we should use + get?id(). But since keyserv needs geteuid(), we have no other chance. + It would be much better, if the kernel could pass both to the server. */ + cred.pid = getpid (); + cred.uid = geteuid (); + cred.gid = getegid (); + + memcpy (CMSG_DATA(cmsg), &cred, sizeof (struct ucred)); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_CREDENTIALS; + cmsg->cmsg_len = sizeof(*cmsg) + sizeof(struct ucred); + + iov.iov_base = data; + iov.iov_len = cnt; + + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_control = cmsg; + msg.msg_controllen = CMSG_ALIGN(cmsg->cmsg_len); + msg.msg_flags = 0; + + restart: + len = sendmsg (sock, &msg, 0); + if (len >= 0) + return len; + if (errno == EINTR) + goto restart; + return -1; + +#endif +} + + +/* + * Interface between xdr serializer and unix connection. + * Behaves like the system calls, read & write, but keeps some error state + * around for the rpc level. + */ +static int +readunix (char *ctptr, char *buf, int len) +{ + struct ct_data *ct = (struct ct_data *) ctptr; + struct pollfd fd; + int milliseconds = ((ct->ct_wait.tv_sec * 1000) + + (ct->ct_wait.tv_usec / 1000)); + + if (len == 0) + return 0; + + fd.fd = ct->ct_sock; + fd.events = POLLIN; + while (TRUE) + { + switch (poll (&fd, 1, milliseconds)) + { + case 0: + ct->ct_error.re_status = RPC_TIMEDOUT; + return -1; + + case -1: + if (errno == EINTR) + continue; + ct->ct_error.re_status = RPC_CANTRECV; + ct->ct_error.re_errno = errno; + return -1; + } + break; + } + switch (len = __msgread (ct->ct_sock, buf, len)) + { + + case 0: + /* premature eof */ + ct->ct_error.re_errno = ECONNRESET; + ct->ct_error.re_status = RPC_CANTRECV; + len = -1; /* it's really an error */ + break; + + case -1: + ct->ct_error.re_errno = errno; + ct->ct_error.re_status = RPC_CANTRECV; + break; + } + return len; +} + +static int +writeunix (char *ctptr, char *buf, int len) +{ + int i, cnt; + struct ct_data *ct = (struct ct_data *) ctptr; + + for (cnt = len; cnt > 0; cnt -= i, buf += i) + { + if ((i = __msgwrite (ct->ct_sock, buf, cnt)) == -1) + { + ct->ct_error.re_errno = errno; + ct->ct_error.re_status = RPC_CANTSEND; + return -1; + } + } + return len; +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/clnt_ext.h 2007-01-30 11:47:24.000000000 +0000 @@ -0,0 +1,18 @@ +/* + * clnt_ext.h: Interface to the SunRPC over external program. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +#ifndef __CLNT_EXT_H__ +#define __CLNT_EXT_H__ + +extern CLIENT *clntext_create (char *filename, char *argv[], + u_long prog, u_long vers, + int *sockp, u_int sendsz, u_int recvsz); + +#endif /* __CLNT_EXT_H__ */ --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/clnt_gnutls.c 2007-01-30 17:03:31.000000000 +0000 @@ -0,0 +1,603 @@ +/* + * clnt_gnutls.c: SunRPC over GnuTLS client. This is a modified version + * of clnt_tcp.c from glibc which is written to run over GnuTLS. + * + * Modifications from glibc-2.5 base by Richard Jones <rjones(a)redhat.com>. + */ + +/* @(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC */ +/* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. + * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ +#if !defined(lint) && defined(SCCSIDS) +static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; +#endif + +/* + * clnt_tcp.c, Implements a TCP/IP based, client side RPC. + * + * Copyright (C) 1984, Sun Microsystems, Inc. + * + * TCP based RPC supports 'batched calls'. + * A sequence of calls may be batched-up in a send buffer. The rpc call + * return immediately to the client even though the call was not necessarily + * sent. The batching occurs if the results' xdr routine is NULL (0) AND + * the rpc timeout value is zero (see clnt.h, rpc). + * + * Clients should NOT casually batch calls that in fact return results; that is, + * the server side should be aware that a call is batched and not produce any + * return message. Batched calls that produce many result messages can + * deadlock (netlock) the client and the server.... + * + * Now go hang yourself. + */ + +#include <netdb.h> +#include <errno.h> +#include <stdio.h> +#include <unistd.h> +#include <libintl.h> +#include <rpc/rpc.h> +#include <sys/poll.h> +#include <sys/socket.h> +#include <rpc/pmap_clnt.h> +#ifdef USE_IN_LIBIO +# include <wchar.h> +#endif +#include <gnutls/gnutls.h> + +#include "clnt_gnutls.h" + +extern u_long _create_xid (void); + +#define MCALL_MSG_SIZE 24 + +struct ct_data + { + int ct_sock; + bool_t ct_closeit; + struct timeval ct_wait; + bool_t ct_waitset; /* wait set by clnt_control? */ + struct rpc_err ct_error; + char ct_mcall[MCALL_MSG_SIZE]; /* marshalled callmsg */ + u_int ct_mpos; /* pos after marshal */ + XDR ct_xdrs; + gnutls_session_t ct_session; /* GnuTLS session. */ + }; + +static int readtcp (char *, char *, int); +static int writetcp (char *, char *, int); + +static enum clnt_stat clnttcp_call (CLIENT *, u_long, xdrproc_t, caddr_t, + xdrproc_t, caddr_t, struct timeval); +static void clnttcp_abort (void); +static void clnttcp_geterr (CLIENT *, struct rpc_err *); +static bool_t clnttcp_freeres (CLIENT *, xdrproc_t, caddr_t); +static bool_t clnttcp_control (CLIENT *, int, char *); +static void clnttcp_destroy (CLIENT *); + +static const struct clnt_ops tcp_ops = +{ + clnttcp_call, + clnttcp_abort, + clnttcp_geterr, + clnttcp_freeres, + clnttcp_destroy, + clnttcp_control +}; + +static int start_gnutls_session (gnutls_certificate_credentials_t xcred, + struct ct_data *ct, int sock); +/* + * Create a client handle for a tcp/ip connection. + * If *sockp<0, *sockp is set to a newly created TCP socket and it is + * connected to raddr. If *sockp non-negative then + * raddr is ignored. The rpc/tcp package does buffering + * similar to stdio, so the client must pick send and receive buffer sizes,]; + * 0 => use the default. + * If raddr->sin_port is 0, then a binder on the remote machine is + * consulted for the right port number. + * NB: *sockp is copied into a private area. + * NB: It is the clients responsibility to close *sockp. + * NB: The rpch->cl_auth is set null authentication. Caller may wish to set this + * something more useful. + */ +CLIENT * +clntgnutls_create (int pf, struct sockaddr *raddr, int raddr_size, + gnutls_certificate_credentials_t xcred, + u_long prog, u_long vers, + int *sockp, u_int sendsz, u_int recvsz) +{ + CLIENT *h; + struct ct_data *ct; + struct rpc_msg call_msg; + + h = (CLIENT *) mem_alloc (sizeof (*h)); + ct = (struct ct_data *) mem_alloc (sizeof (*ct)); + if (h == NULL || ct == NULL) + { + struct rpc_createerr *ce = &get_rpc_createerr (); + (void) fprintf (stderr, "clnttcp_create: out of memory\n"); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = ENOMEM; + goto fooy; + } + +#if 0 + // RWMJ: Note this will never be supported for portmap because the + // portmap protocol depends pretty fundamentally on IPv4. Don't + /// use portmapper anyway -- it's silly. + /* + * If no port number given ask the pmap for one + */ + if (port == 0) + { + u_short port; + if ((port = pmap_getport (raddr, prog, vers, IPPROTO_TCP)) == 0) + { + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); + return ((CLIENT *) NULL); + } + raddr->sin_port = htons (port); + } +#endif + + /* + * If no socket given, open one + */ + if (*sockp < 0) + { + *sockp = socket (pf, SOCK_STREAM, 0); + // RWMJ: Why? + //(void) bindresvport (*sockp, (struct sockaddr_in *) 0); + if ((*sockp < 0) + || (connect (*sockp, raddr, raddr_size) < 0)) + { + struct rpc_createerr *ce = &get_rpc_createerr (); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = errno; + if (*sockp >= 0) + (void) close (*sockp); + goto fooy; + } + ct->ct_closeit = TRUE; + } + else + { + ct->ct_closeit = FALSE; + } + + /* + * Set up private data struct + */ + ct->ct_sock = *sockp; + ct->ct_wait.tv_usec = 0; + ct->ct_waitset = FALSE; + + /* + * Initialize call message + */ + call_msg.rm_xid = _create_xid (); + call_msg.rm_direction = CALL; + call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; + call_msg.rm_call.cb_prog = prog; + call_msg.rm_call.cb_vers = vers; + + /* + * pre-serialize the static part of the call msg and stash it away + */ + xdrmem_create (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, + XDR_ENCODE); + if (!xdr_callhdr (&(ct->ct_xdrs), &call_msg)) + { + if (ct->ct_closeit) + { + (void) close (*sockp); + } + goto fooy; + } + ct->ct_mpos = XDR_GETPOS (&(ct->ct_xdrs)); + XDR_DESTROY (&(ct->ct_xdrs)); + + /* + * Create a client handle which uses xdrrec for serialization + * and authnone for authentication. + */ + xdrrec_create (&(ct->ct_xdrs), sendsz, recvsz, + (caddr_t) ct, readtcp, writetcp); + h->cl_ops = (struct clnt_ops *) &tcp_ops; + h->cl_private = (caddr_t) ct; + h->cl_auth = authnone_create (); + + /* Start GnuTLS on this socket. */ + if (start_gnutls_session (xcred, ct, *sockp) == -1) { + if (ct->ct_closeit) + close (*sockp); + goto fooy; + } + + return h; + +fooy: + /* + * Something goofed, free stuff and barf + */ + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); + return ((CLIENT *) NULL); +} + +static int +start_gnutls_session (gnutls_certificate_credentials_t xcred, + struct ct_data *ct, int sock) +{ + const int cert_type_priority[3] = { + GNUTLS_CRT_X509, + GNUTLS_CRT_OPENPGP, + 0 + }; + + /* Initialize TLS session + */ + gnutls_init (&ct->ct_session, GNUTLS_CLIENT); + + /* Use default priorities */ + gnutls_set_default_priority (ct->ct_session); + gnutls_certificate_type_set_priority (ct->ct_session, cert_type_priority); + + /* put the x509 credentials to the current session + */ + gnutls_credentials_set (ct->ct_session, GNUTLS_CRD_CERTIFICATE, xcred); + + gnutls_transport_set_ptr (ct->ct_session, + (gnutls_transport_ptr_t) (long) sock); + + /* Perform the TLS handshake + */ + int ret = gnutls_handshake (ct->ct_session); + + if (ret < 0) + { + fprintf (stderr, "clnt_gnutls: TLS handshake failed\n"); + gnutls_perror (ret); + exit (1); + } + + /* XXX You need to verify the peer's certificate matches its name. */ + printf ("XXX need to verify peer's certificate matches its name.\n"); + +#if 0 + /* Print session info. */ + print_info (session); +#endif + + return 0; +} + +static enum clnt_stat +clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) + CLIENT *h; + u_long proc; + xdrproc_t xdr_args; + caddr_t args_ptr; + xdrproc_t xdr_results; + caddr_t results_ptr; + struct timeval timeout; +{ + struct ct_data *ct = (struct ct_data *) h->cl_private; + XDR *xdrs = &(ct->ct_xdrs); + struct rpc_msg reply_msg; + u_long x_id; + u_int32_t *msg_x_id = (u_int32_t *) (ct->ct_mcall); /* yuk */ + bool_t shipnow; + int refreshes = 2; + + if (!ct->ct_waitset) + { + ct->ct_wait = timeout; + } + + shipnow = + (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0 + && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE; + +call_again: + xdrs->x_op = XDR_ENCODE; + ct->ct_error.re_status = RPC_SUCCESS; + x_id = ntohl (--(*msg_x_id)); + if ((!XDR_PUTBYTES (xdrs, ct->ct_mcall, ct->ct_mpos)) || + (!XDR_PUTLONG (xdrs, (long *) &proc)) || + (!AUTH_MARSHALL (h->cl_auth, xdrs)) || + (!(*xdr_args) (xdrs, args_ptr))) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTENCODEARGS; + (void) xdrrec_endofrecord (xdrs, TRUE); + return (ct->ct_error.re_status); + } + if (!xdrrec_endofrecord (xdrs, shipnow)) + return ct->ct_error.re_status = RPC_CANTSEND; + if (!shipnow) + return RPC_SUCCESS; + /* + * Hack to provide rpc-based message passing + */ + if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0) + { + return ct->ct_error.re_status = RPC_TIMEDOUT; + } + + + /* + * Keep receiving until we get a valid transaction id + */ + xdrs->x_op = XDR_DECODE; + while (TRUE) + { + reply_msg.acpted_rply.ar_verf = _null_auth; + reply_msg.acpted_rply.ar_results.where = NULL; + reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; + if (!xdrrec_skiprecord (xdrs)) + return (ct->ct_error.re_status); + /* now decode and validate the response header */ + if (!xdr_replymsg (xdrs, &reply_msg)) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + continue; + return ct->ct_error.re_status; + } + if ((u_int32_t) reply_msg.rm_xid == (u_int32_t) x_id) + break; + } + + /* + * process header + */ + _seterr_reply (&reply_msg, &(ct->ct_error)); + if (ct->ct_error.re_status == RPC_SUCCESS) + { + if (!AUTH_VALIDATE (h->cl_auth, &reply_msg.acpted_rply.ar_verf)) + { + ct->ct_error.re_status = RPC_AUTHERROR; + ct->ct_error.re_why = AUTH_INVALIDRESP; + } + else if (!(*xdr_results) (xdrs, results_ptr)) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTDECODERES; + } + /* free verifier ... */ + if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) + { + xdrs->x_op = XDR_FREE; + (void) xdr_opaque_auth (xdrs, + &(reply_msg.acpted_rply.ar_verf)); + } + } /* end successful completion */ + else + { + /* maybe our credentials need to be refreshed ... */ + if (refreshes-- && AUTH_REFRESH (h->cl_auth)) + goto call_again; + } /* end of unsuccessful completion */ + return ct->ct_error.re_status; +} + +static void +clnttcp_geterr (h, errp) + CLIENT *h; + struct rpc_err *errp; +{ + struct ct_data *ct = + (struct ct_data *) h->cl_private; + + *errp = ct->ct_error; +} + +static bool_t +clnttcp_freeres (cl, xdr_res, res_ptr) + CLIENT *cl; + xdrproc_t xdr_res; + caddr_t res_ptr; +{ + struct ct_data *ct = (struct ct_data *) cl->cl_private; + XDR *xdrs = &(ct->ct_xdrs); + + xdrs->x_op = XDR_FREE; + return (*xdr_res) (xdrs, res_ptr); +} + +static void +clnttcp_abort () +{ +} + +static bool_t +clnttcp_control (CLIENT *cl, int request, char *info) +{ + struct ct_data *ct = (struct ct_data *) cl->cl_private; + + + switch (request) + { + case CLSET_FD_CLOSE: + ct->ct_closeit = TRUE; + break; + case CLSET_FD_NCLOSE: + ct->ct_closeit = FALSE; + break; + case CLSET_TIMEOUT: + ct->ct_wait = *(struct timeval *) info; + ct->ct_waitset = TRUE; + break; + case CLGET_TIMEOUT: + *(struct timeval *) info = ct->ct_wait; + break; + case CLGET_FD: + *(int *)info = ct->ct_sock; + break; + case CLGET_XID: + /* + * use the knowledge that xid is the + * first element in the call structure *. + * This will get the xid of the PREVIOUS call + */ + *(u_long *)info = ntohl (*(u_long *)ct->ct_mcall); + break; + case CLSET_XID: + /* This will set the xid of the NEXT call */ + *(u_long *)ct->ct_mcall = htonl (*(u_long *)info - 1); + /* decrement by 1 as clnttcp_call() increments once */ + case CLGET_VERS: + /* + * This RELIES on the information that, in the call body, + * the version number field is the fifth field from the + * begining of the RPC header. MUST be changed if the + * call_struct is changed + */ + *(u_long *)info = ntohl (*(u_long *)(ct->ct_mcall + + 4 * BYTES_PER_XDR_UNIT)); + break; + case CLSET_VERS: + *(u_long *)(ct->ct_mcall + 4 * BYTES_PER_XDR_UNIT) + = htonl (*(u_long *)info); + break; + case CLGET_PROG: + /* + * This RELIES on the information that, in the call body, + * the program number field is the field from the + * begining of the RPC header. MUST be changed if the + * call_struct is changed + */ + *(u_long *)info = ntohl(*(u_long *)(ct->ct_mcall + + 3 * BYTES_PER_XDR_UNIT)); + break; + case CLSET_PROG: + *(u_long *)(ct->ct_mcall + 3 * BYTES_PER_XDR_UNIT) + = htonl(*(u_long *)info); + break; + /* The following are only possible with TI-RPC */ + case CLGET_RETRY_TIMEOUT: + case CLSET_RETRY_TIMEOUT: + case CLGET_SVC_ADDR: + case CLSET_SVC_ADDR: + case CLSET_PUSH_TIMOD: + case CLSET_POP_TIMOD: + default: + return FALSE; + } + return TRUE; +} + + +static void +clnttcp_destroy (CLIENT *h) +{ + struct ct_data *ct = + (struct ct_data *) h->cl_private; + + gnutls_bye (ct->ct_session, GNUTLS_SHUT_RDWR); + gnutls_deinit (ct->ct_session); + + if (ct->ct_closeit) + { + (void) close (ct->ct_sock); + } + XDR_DESTROY (&(ct->ct_xdrs)); + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); +} + +/* + * Interface between xdr serializer and tcp connection. + * Behaves like the system calls, read & write, but keeps some error state + * around for the rpc level. + */ +static int +readtcp (char *ctptr, char *buf, int len) +{ + struct ct_data *ct = (struct ct_data *)ctptr; + struct pollfd fd; + int milliseconds = (ct->ct_wait.tv_sec * 1000) + + (ct->ct_wait.tv_usec / 1000); + + if (len == 0) + return 0; + + fd.fd = ct->ct_sock; + fd.events = POLLIN; + while (TRUE) + { + switch (poll(&fd, 1, milliseconds)) + { + case 0: + ct->ct_error.re_status = RPC_TIMEDOUT; + return -1; + + case -1: + if (errno == EINTR) + continue; + ct->ct_error.re_status = RPC_CANTRECV; + ct->ct_error.re_errno = errno; + return -1; + } + break; + } + + switch (len = gnutls_record_recv (ct->ct_session, buf, len)) + { + case 0: + /* premature eof */ + ct->ct_error.re_errno = ECONNRESET; + ct->ct_error.re_status = RPC_CANTRECV; + len = -1; /* it's really an error */ + break; + + case -1: + ct->ct_error.re_errno = errno; + ct->ct_error.re_status = RPC_CANTRECV; + break; + } + return len; +} + +static int +writetcp (char *ctptr, char *buf, int len) +{ + struct ct_data *ct = (struct ct_data*)ctptr; + + if (gnutls_record_send (ct->ct_session, buf, len) < 0) + { + ct->ct_error.re_errno = errno; + ct->ct_error.re_status = RPC_CANTSEND; + return -1; + } + + return len; +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/clnt_gnutls.h 2007-01-30 11:59:17.000000000 +0000 @@ -0,0 +1,20 @@ +/* + * clnt_gnutls.h: Interface to the SunRPC over GnuTLS. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +#ifndef __CLNT_GNUTLS_H__ +#define __CLNT_GNUTLS_H__ + +extern CLIENT *clntgnutls_create (int pf, + struct sockaddr *raddr, int raddr_size, + gnutls_certificate_credentials_t xcred, + u_long prog, u_long vers, + int *sockp, u_int sendsz, u_int recvsz); + +#endif /* __CLNT_GNUTLS_H__ */ --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/clnt_tcp2.c 2007-01-30 16:08:20.000000000 +0000 @@ -0,0 +1,544 @@ +/* + * clnt_tcp2.c: SunRPC TCP client. This is a very slightly modified + * version of clnt_tcp.c from glibc which removes some of the IPv4 + * assumptions, so this version can be used over IPv4 or IPv6 sockets. + * + * Modifications from glibc-2.5 base by Richard Jones <rjones(a)redhat.com>. + */ + +/* @(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC */ +/* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. + * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ +#if !defined(lint) && defined(SCCSIDS) +static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; +#endif + +/* + * clnt_tcp.c, Implements a TCP/IP based, client side RPC. + * + * Copyright (C) 1984, Sun Microsystems, Inc. + * + * TCP based RPC supports 'batched calls'. + * A sequence of calls may be batched-up in a send buffer. The rpc call + * return immediately to the client even though the call was not necessarily + * sent. The batching occurs if the results' xdr routine is NULL (0) AND + * the rpc timeout value is zero (see clnt.h, rpc). + * + * Clients should NOT casually batch calls that in fact return results; that is, + * the server side should be aware that a call is batched and not produce any + * return message. Batched calls that produce many result messages can + * deadlock (netlock) the client and the server.... + * + * Now go hang yourself. + */ + +#include <netdb.h> +#include <errno.h> +#include <stdio.h> +#include <unistd.h> +#include <libintl.h> +#include <rpc/rpc.h> +#include <sys/poll.h> +#include <sys/socket.h> +#include <rpc/pmap_clnt.h> +#ifdef USE_IN_LIBIO +# include <wchar.h> +#endif + +#include "clnt_tcp2.h" + +extern u_long _create_xid (void); + +#define MCALL_MSG_SIZE 24 + +struct ct_data + { + int ct_sock; + bool_t ct_closeit; + struct timeval ct_wait; + bool_t ct_waitset; /* wait set by clnt_control? */ + struct rpc_err ct_error; + char ct_mcall[MCALL_MSG_SIZE]; /* marshalled callmsg */ + u_int ct_mpos; /* pos after marshal */ + XDR ct_xdrs; + }; + +static int readtcp (char *, char *, int); +static int writetcp (char *, char *, int); + +static enum clnt_stat clnttcp_call (CLIENT *, u_long, xdrproc_t, caddr_t, + xdrproc_t, caddr_t, struct timeval); +static void clnttcp_abort (void); +static void clnttcp_geterr (CLIENT *, struct rpc_err *); +static bool_t clnttcp_freeres (CLIENT *, xdrproc_t, caddr_t); +static bool_t clnttcp_control (CLIENT *, int, char *); +static void clnttcp_destroy (CLIENT *); + +static const struct clnt_ops tcp_ops = +{ + clnttcp_call, + clnttcp_abort, + clnttcp_geterr, + clnttcp_freeres, + clnttcp_destroy, + clnttcp_control +}; + +/* + * Create a client handle for a tcp/ip connection. + * If *sockp<0, *sockp is set to a newly created TCP socket and it is + * connected to raddr. If *sockp non-negative then + * raddr is ignored. The rpc/tcp package does buffering + * similar to stdio, so the client must pick send and receive buffer sizes,]; + * 0 => use the default. + * If raddr->sin_port is 0, then a binder on the remote machine is + * consulted for the right port number. + * NB: *sockp is copied into a private area. + * NB: It is the clients responsibility to close *sockp. + * NB: The rpch->cl_auth is set null authentication. Caller may wish to set this + * something more useful. + */ +CLIENT * +clnttcp2_create (int af, struct sockaddr *raddr, int raddr_size, + u_long prog, u_long vers, + int *sockp, u_int sendsz, u_int recvsz) +{ + CLIENT *h; + struct ct_data *ct; + struct rpc_msg call_msg; + + h = (CLIENT *) mem_alloc (sizeof (*h)); + ct = (struct ct_data *) mem_alloc (sizeof (*ct)); + if (h == NULL || ct == NULL) + { + struct rpc_createerr *ce = &get_rpc_createerr (); + (void) fprintf (stderr, "clnttcp_create: out of memory\n"); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = ENOMEM; + goto fooy; + } + +#if 0 + // RWMJ: Note this will never be supported for portmap because the + // portmap protocol depends pretty fundamentally on IPv4. Don't + /// use portmapper anyway -- it's silly. + /* + * If no port number given ask the pmap for one + */ + if (port == 0) + { + u_short port; + if ((port = pmap_getport (raddr, prog, vers, IPPROTO_TCP)) == 0) + { + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); + return ((CLIENT *) NULL); + } + raddr->sin_port = htons (port); + } +#endif + + /* + * If no socket given, open one + */ + if (*sockp < 0) + { + *sockp = socket (af, SOCK_STREAM, 0); + // RWMJ: Why? + //(void) bindresvport (*sockp, (struct sockaddr_in *) 0); + if ((*sockp < 0) + || (connect (*sockp, raddr, raddr_size) < 0)) + { + struct rpc_createerr *ce = &get_rpc_createerr (); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = errno; + if (*sockp >= 0) + (void) close (*sockp); + goto fooy; + } + ct->ct_closeit = TRUE; + } + else + { + ct->ct_closeit = FALSE; + } + + /* + * Set up private data struct + */ + ct->ct_sock = *sockp; + ct->ct_wait.tv_usec = 0; + ct->ct_waitset = FALSE; + + /* + * Initialize call message + */ + call_msg.rm_xid = _create_xid (); + call_msg.rm_direction = CALL; + call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; + call_msg.rm_call.cb_prog = prog; + call_msg.rm_call.cb_vers = vers; + + /* + * pre-serialize the static part of the call msg and stash it away + */ + xdrmem_create (&(ct->ct_xdrs), ct->ct_mcall, MCALL_MSG_SIZE, + XDR_ENCODE); + if (!xdr_callhdr (&(ct->ct_xdrs), &call_msg)) + { + if (ct->ct_closeit) + { + (void) close (*sockp); + } + goto fooy; + } + ct->ct_mpos = XDR_GETPOS (&(ct->ct_xdrs)); + XDR_DESTROY (&(ct->ct_xdrs)); + + /* + * Create a client handle which uses xdrrec for serialization + * and authnone for authentication. + */ + xdrrec_create (&(ct->ct_xdrs), sendsz, recvsz, + (caddr_t) ct, readtcp, writetcp); + h->cl_ops = (struct clnt_ops *) &tcp_ops; + h->cl_private = (caddr_t) ct; + h->cl_auth = authnone_create (); + return h; + +fooy: + /* + * Something goofed, free stuff and barf + */ + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); + return ((CLIENT *) NULL); +} + +static enum clnt_stat +clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) + CLIENT *h; + u_long proc; + xdrproc_t xdr_args; + caddr_t args_ptr; + xdrproc_t xdr_results; + caddr_t results_ptr; + struct timeval timeout; +{ + struct ct_data *ct = (struct ct_data *) h->cl_private; + XDR *xdrs = &(ct->ct_xdrs); + struct rpc_msg reply_msg; + u_long x_id; + u_int32_t *msg_x_id = (u_int32_t *) (ct->ct_mcall); /* yuk */ + bool_t shipnow; + int refreshes = 2; + + if (!ct->ct_waitset) + { + ct->ct_wait = timeout; + } + + shipnow = + (xdr_results == (xdrproc_t) 0 && ct->ct_wait.tv_sec == 0 + && ct->ct_wait.tv_usec == 0) ? FALSE : TRUE; + +call_again: + xdrs->x_op = XDR_ENCODE; + ct->ct_error.re_status = RPC_SUCCESS; + x_id = ntohl (--(*msg_x_id)); + if ((!XDR_PUTBYTES (xdrs, ct->ct_mcall, ct->ct_mpos)) || + (!XDR_PUTLONG (xdrs, (long *) &proc)) || + (!AUTH_MARSHALL (h->cl_auth, xdrs)) || + (!(*xdr_args) (xdrs, args_ptr))) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTENCODEARGS; + (void) xdrrec_endofrecord (xdrs, TRUE); + return (ct->ct_error.re_status); + } + if (!xdrrec_endofrecord (xdrs, shipnow)) + return ct->ct_error.re_status = RPC_CANTSEND; + if (!shipnow) + return RPC_SUCCESS; + /* + * Hack to provide rpc-based message passing + */ + if (ct->ct_wait.tv_sec == 0 && ct->ct_wait.tv_usec == 0) + { + return ct->ct_error.re_status = RPC_TIMEDOUT; + } + + + /* + * Keep receiving until we get a valid transaction id + */ + xdrs->x_op = XDR_DECODE; + while (TRUE) + { + reply_msg.acpted_rply.ar_verf = _null_auth; + reply_msg.acpted_rply.ar_results.where = NULL; + reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; + if (!xdrrec_skiprecord (xdrs)) + return (ct->ct_error.re_status); + /* now decode and validate the response header */ + if (!xdr_replymsg (xdrs, &reply_msg)) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + continue; + return ct->ct_error.re_status; + } + if ((u_int32_t) reply_msg.rm_xid == (u_int32_t) x_id) + break; + } + + /* + * process header + */ + _seterr_reply (&reply_msg, &(ct->ct_error)); + if (ct->ct_error.re_status == RPC_SUCCESS) + { + if (!AUTH_VALIDATE (h->cl_auth, &reply_msg.acpted_rply.ar_verf)) + { + ct->ct_error.re_status = RPC_AUTHERROR; + ct->ct_error.re_why = AUTH_INVALIDRESP; + } + else if (!(*xdr_results) (xdrs, results_ptr)) + { + if (ct->ct_error.re_status == RPC_SUCCESS) + ct->ct_error.re_status = RPC_CANTDECODERES; + } + /* free verifier ... */ + if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) + { + xdrs->x_op = XDR_FREE; + (void) xdr_opaque_auth (xdrs, + &(reply_msg.acpted_rply.ar_verf)); + } + } /* end successful completion */ + else + { + /* maybe our credentials need to be refreshed ... */ + if (refreshes-- && AUTH_REFRESH (h->cl_auth)) + goto call_again; + } /* end of unsuccessful completion */ + return ct->ct_error.re_status; +} + +static void +clnttcp_geterr (h, errp) + CLIENT *h; + struct rpc_err *errp; +{ + struct ct_data *ct = + (struct ct_data *) h->cl_private; + + *errp = ct->ct_error; +} + +static bool_t +clnttcp_freeres (cl, xdr_res, res_ptr) + CLIENT *cl; + xdrproc_t xdr_res; + caddr_t res_ptr; +{ + struct ct_data *ct = (struct ct_data *) cl->cl_private; + XDR *xdrs = &(ct->ct_xdrs); + + xdrs->x_op = XDR_FREE; + return (*xdr_res) (xdrs, res_ptr); +} + +static void +clnttcp_abort () +{ +} + +static bool_t +clnttcp_control (CLIENT *cl, int request, char *info) +{ + struct ct_data *ct = (struct ct_data *) cl->cl_private; + + + switch (request) + { + case CLSET_FD_CLOSE: + ct->ct_closeit = TRUE; + break; + case CLSET_FD_NCLOSE: + ct->ct_closeit = FALSE; + break; + case CLSET_TIMEOUT: + ct->ct_wait = *(struct timeval *) info; + ct->ct_waitset = TRUE; + break; + case CLGET_TIMEOUT: + *(struct timeval *) info = ct->ct_wait; + break; + case CLGET_FD: + *(int *)info = ct->ct_sock; + break; + case CLGET_XID: + /* + * use the knowledge that xid is the + * first element in the call structure *. + * This will get the xid of the PREVIOUS call + */ + *(u_long *)info = ntohl (*(u_long *)ct->ct_mcall); + break; + case CLSET_XID: + /* This will set the xid of the NEXT call */ + *(u_long *)ct->ct_mcall = htonl (*(u_long *)info - 1); + /* decrement by 1 as clnttcp_call() increments once */ + case CLGET_VERS: + /* + * This RELIES on the information that, in the call body, + * the version number field is the fifth field from the + * begining of the RPC header. MUST be changed if the + * call_struct is changed + */ + *(u_long *)info = ntohl (*(u_long *)(ct->ct_mcall + + 4 * BYTES_PER_XDR_UNIT)); + break; + case CLSET_VERS: + *(u_long *)(ct->ct_mcall + 4 * BYTES_PER_XDR_UNIT) + = htonl (*(u_long *)info); + break; + case CLGET_PROG: + /* + * This RELIES on the information that, in the call body, + * the program number field is the field from the + * begining of the RPC header. MUST be changed if the + * call_struct is changed + */ + *(u_long *)info = ntohl(*(u_long *)(ct->ct_mcall + + 3 * BYTES_PER_XDR_UNIT)); + break; + case CLSET_PROG: + *(u_long *)(ct->ct_mcall + 3 * BYTES_PER_XDR_UNIT) + = htonl(*(u_long *)info); + break; + /* The following are only possible with TI-RPC */ + case CLGET_RETRY_TIMEOUT: + case CLSET_RETRY_TIMEOUT: + case CLGET_SVC_ADDR: + case CLSET_SVC_ADDR: + case CLSET_PUSH_TIMOD: + case CLSET_POP_TIMOD: + default: + return FALSE; + } + return TRUE; +} + + +static void +clnttcp_destroy (CLIENT *h) +{ + struct ct_data *ct = + (struct ct_data *) h->cl_private; + + if (ct->ct_closeit) + { + (void) close (ct->ct_sock); + } + XDR_DESTROY (&(ct->ct_xdrs)); + mem_free ((caddr_t) ct, sizeof (struct ct_data)); + mem_free ((caddr_t) h, sizeof (CLIENT)); +} + +/* + * Interface between xdr serializer and tcp connection. + * Behaves like the system calls, read & write, but keeps some error state + * around for the rpc level. + */ +static int +readtcp (char *ctptr, char *buf, int len) +{ + struct ct_data *ct = (struct ct_data *)ctptr; + struct pollfd fd; + int milliseconds = (ct->ct_wait.tv_sec * 1000) + + (ct->ct_wait.tv_usec / 1000); + + if (len == 0) + return 0; + + fd.fd = ct->ct_sock; + fd.events = POLLIN; + while (TRUE) + { + switch (poll(&fd, 1, milliseconds)) + { + case 0: + ct->ct_error.re_status = RPC_TIMEDOUT; + return -1; + + case -1: + if (errno == EINTR) + continue; + ct->ct_error.re_status = RPC_CANTRECV; + ct->ct_error.re_errno = errno; + return -1; + } + break; + } + switch (len = read (ct->ct_sock, buf, len)) + { + + case 0: + /* premature eof */ + ct->ct_error.re_errno = ECONNRESET; + ct->ct_error.re_status = RPC_CANTRECV; + len = -1; /* it's really an error */ + break; + + case -1: + ct->ct_error.re_errno = errno; + ct->ct_error.re_status = RPC_CANTRECV; + break; + } + return len; +} + +static int +writetcp (char *ctptr, char *buf, int len) +{ + int i, cnt; + struct ct_data *ct = (struct ct_data*)ctptr; + + for (cnt = len; cnt > 0; cnt -= i, buf += i) + { + if ((i = write (ct->ct_sock, buf, cnt)) == -1) + { + ct->ct_error.re_errno = errno; + ct->ct_error.re_status = RPC_CANTSEND; + return -1; + } + } + return len; +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/clnt_tcp2.h 2007-01-30 15:26:09.000000000 +0000 @@ -0,0 +1,18 @@ +/* + * clnt_tcp2.h: Interface to the SunRPC over TCP. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +#ifndef __CLNT_TCP2_H__ +#define __CLNT_TCP2_H__ + +extern CLIENT *clnttcp2_create (int af, struct sockaddr *raddr, int raddr_size, + u_long prog, u_long vers, + int *sockp, u_int sendsz, u_int recvsz); + +#endif /* __CLNT_TCP2_H__ */ --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/create_xid.c 2007-01-30 13:21:07.000000000 +0000 @@ -0,0 +1,55 @@ +/* + * create_xid.c: Makes unique, unguessable identifiers. This is modified + * from the original source found in glibc-2.5. The original version + * is thread safe (but the rest of SunRPC isn't). This version is + * not thread safe. + * + * Modifications from glibc-2.5 base by Richard Jones <rjones(a)redhat.com>. + */ + +/* Copyright (c) 1998, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Thorsten Kukuk <kukuk(a)vt.uni-paderborn.de>, 1998. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <unistd.h> +#include <stdlib.h> +#include <sys/time.h> +#include <bits/libc-lock.h> +#include <rpc/rpc.h> + +static int is_initialized; +static struct drand48_data __rpc_lrand48_data; + +unsigned long +_create_xid (void) +{ + long int res; + + if (!is_initialized) + { + struct timeval now; + + gettimeofday (&now, (struct timezone *) 0); + srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data); + is_initialized = 1; + } + + lrand48_r (&__rpc_lrand48_data, &res); + + return res; +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/svc_gnutls.c 2007-01-30 17:03:35.000000000 +0000 @@ -0,0 +1,477 @@ +/* + * svc_gnutls.c: SunRPC over GnuTLS server. This is a modified version + * of svc_tcp.c from glibc which is written to run over GnuTLS. + * + * Modifications from glibc-2.5 base by Richard Jones <rjones(a)redhat.com>. + */ + +/* @(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC */ +/* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. + * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ +#if !defined(lint) && defined(SCCSIDS) +static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro"; +#endif + +/* + * svc_tcp.c, Server side for TCP/IP based RPC. + * + * Copyright (C) 1984, Sun Microsystems, Inc. + * + * Actually implements two flavors of transporter - + * a tcp rendezvouser (a listener and connection establisher) + * and a record/tcp stream. + */ + +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <libintl.h> +#include <rpc/rpc.h> +#include <sys/socket.h> +#include <sys/poll.h> +#include <errno.h> +#include <stdlib.h> + +#ifdef USE_IN_LIBIO +# include <wchar.h> +# include <libio/iolibio.h> +#endif + +#include <gnutls/gnutls.h> +#include "svc_gnutls.h" + +/* + * Ops vector for TCP/IP based rpc service handle + */ +static bool_t svctcp_recv (SVCXPRT *, struct rpc_msg *); +static enum xprt_stat svctcp_stat (SVCXPRT *); +static bool_t svctcp_getargs (SVCXPRT *, xdrproc_t, caddr_t); +static bool_t svctcp_reply (SVCXPRT *, struct rpc_msg *); +static bool_t svctcp_freeargs (SVCXPRT *, xdrproc_t, caddr_t); +static void svctcp_destroy (SVCXPRT *); + +static const struct xp_ops svctcp_op = +{ + svctcp_recv, + svctcp_stat, + svctcp_getargs, + svctcp_reply, + svctcp_freeargs, + svctcp_destroy +}; + +/* + * Ops vector for TCP/IP rendezvous handler + */ +static bool_t rendezvous_request (SVCXPRT *, struct rpc_msg *); +static enum xprt_stat rendezvous_stat (SVCXPRT *); +static void svctcp_rendezvous_abort (void) __attribute__ ((__noreturn__)); + +/* This function makes sure abort() relocation goes through PLT + and thus can be lazy bound. */ +static void +svctcp_rendezvous_abort (void) +{ + abort (); +}; + +static const struct xp_ops svctcp_rendezvous_op = +{ + rendezvous_request, + rendezvous_stat, + (bool_t (*) (SVCXPRT *, xdrproc_t, caddr_t)) svctcp_rendezvous_abort, + (bool_t (*) (SVCXPRT *, struct rpc_msg *)) svctcp_rendezvous_abort, + (bool_t (*) (SVCXPRT *, xdrproc_t, caddr_t)) svctcp_rendezvous_abort, + svctcp_destroy +}; + +static int readtcp (char*, char *, int); +static int writetcp (char *, char *, int); +static SVCXPRT *makefd_xprt (int, u_int, u_int, gnutls_session_t); + +struct tcp_rendezvous + { /* kept in xprt->xp_p1 */ + u_int sendsize; + u_int recvsize; + gnutls_certificate_credentials_t x509_cred; + }; + +struct tcp_conn + { /* kept in xprt->xp_p1 */ + enum xprt_stat strm_stat; + u_long x_id; + XDR xdrs; + char verf_body[MAX_AUTH_BYTES]; + }; + +/* + * Usage: + * xprt = svcgnutls_create(sock, send_buf_size, recv_buf_size, + * gnutls_certificate_credentials_t x509_cred); + * + * Creates, registers, and returns a (rpc) tcp based transporter. + * Once *xprt is initialized, it is registered as a transporter + * see (svc.h, xprt_register). This routine returns + * a NULL if a problem occurred. + * + * If sock<0 then a socket is created, else sock is used. + * If the socket, sock is not bound to a port then svctcp_create + * binds it to an arbitrary port. The routine then starts a tcp + * listener on the socket's associated port. In any (successful) case, + * xprt->xp_sock is the registered socket number and xprt->xp_port is the + * associated port number. + * + * Since tcp streams do buffered io similar to stdio, the caller can specify + * how big the send and receive buffers are via the second and third parms; + * 0 => use the system default. + */ +SVCXPRT * +svcgnutls_create (int sock, u_int sendsize, u_int recvsize, + gnutls_certificate_credentials_t x509_cred) +{ + bool_t madesock = FALSE; + SVCXPRT *xprt; + struct tcp_rendezvous *r; + struct sockaddr_in addr; + socklen_t len = sizeof (struct sockaddr_in); + + if (sock == RPC_ANYSOCK) + { + if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) + { + perror ("svc_gnutls.c - tcp socket creation problem"); + return (SVCXPRT *) NULL; + } + madesock = TRUE; + } + bzero ((char *) &addr, sizeof (addr)); + addr.sin_family = AF_INET; + if (bindresvport (sock, &addr)) + { + addr.sin_port = 0; + (void) bind (sock, (struct sockaddr *) &addr, len); + } + if ((getsockname (sock, (struct sockaddr *) &addr, &len) != 0) || + (listen (sock, SOMAXCONN) != 0)) + { + perror ("svc_gnutls.c - cannot getsockname or listen"); + if (madesock) + (void) close (sock); + return (SVCXPRT *) NULL; + } + r = (struct tcp_rendezvous *) mem_alloc (sizeof (*r)); + xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); + if (r == NULL || xprt == NULL) + { + (void) fprintf (stderr, "svcgnutls_create: out of memory\n"); + mem_free (r, sizeof (*r)); + mem_free (xprt, sizeof (SVCXPRT)); + return NULL; + } + r->sendsize = sendsize; + r->recvsize = recvsize; + r->x509_cred = x509_cred; + xprt->xp_p2 = NULL; + xprt->xp_p1 = (caddr_t) r; + xprt->xp_verf = _null_auth; + xprt->xp_ops = &svctcp_rendezvous_op; + xprt->xp_port = ntohs (addr.sin_port); + xprt->xp_sock = sock; + xprt_register (xprt); + return xprt; +} + +#if 0 +/* + * Like svtcp_create(), except the routine takes any *open* UNIX file + * descriptor as its first input. + */ +SVCXPRT * +svcfd_create (int fd, u_int sendsize, u_int recvsize) +{ + return makefd_xprt (fd, sendsize, recvsize); +} +#endif + +static SVCXPRT * +makefd_xprt (int fd, u_int sendsize, u_int recvsize, + gnutls_session_t session) +{ + SVCXPRT *xprt; + struct tcp_conn *cd; + + xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); + cd = (struct tcp_conn *) mem_alloc (sizeof (struct tcp_conn)); + if (xprt == (SVCXPRT *) NULL || cd == NULL) + { + (void) fprintf (stderr, "svc_gnutls: makefd_xprt: out of memory\n"); + mem_free (xprt, sizeof (SVCXPRT)); + mem_free (cd, sizeof (struct tcp_conn)); + return NULL; + } + cd->strm_stat = XPRT_IDLE; + xdrrec_create (&(cd->xdrs), sendsize, recvsize, + (caddr_t) xprt, readtcp, writetcp); + xprt->xp_p2 = (caddr_t) session; + xprt->xp_p1 = (caddr_t) cd; + xprt->xp_verf.oa_base = cd->verf_body; + xprt->xp_addrlen = 0; + xprt->xp_ops = &svctcp_op; /* truly deals with calls */ + xprt->xp_port = 0; /* this is a connection, not a rendezvouser */ + xprt->xp_sock = fd; + xprt_register (xprt); + return xprt; +} + +// XXX DH_BITS must be defined the same in the server main loop too. +#define DH_BITS 1024 + +static gnutls_session_t +initialize_tls_session (gnutls_certificate_credentials_t x509_cred) +{ + gnutls_session_t session; + + gnutls_init (&session, GNUTLS_SERVER); + + /* avoid calling all the priority functions, since the defaults + * are adequate. + */ + gnutls_set_default_priority (session); + + gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred); + + /* request client certificate if any. + */ + gnutls_certificate_server_set_request (session, GNUTLS_CERT_REQUEST); + + gnutls_dh_set_prime_bits (session, DH_BITS); + + return session; +} + +static bool_t +rendezvous_request (SVCXPRT *xprt, + struct rpc_msg *errmsg __attribute__((unused))) +{ + int sock; + struct tcp_rendezvous *r; + struct sockaddr_in addr; + socklen_t len; + + r = (struct tcp_rendezvous *) xprt->xp_p1; + gnutls_session_t session = initialize_tls_session (r->x509_cred); + +again: + len = sizeof (struct sockaddr_in); + if ((sock = accept (xprt->xp_sock, (struct sockaddr *) &addr, &len)) < 0) + { + if (errno == EINTR) + goto again; + return FALSE; + } + + gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) (long) sock); + int ret = gnutls_handshake (session); + if (ret < 0) + { + close (sock); + gnutls_deinit (session); + fprintf (stderr, "svc_gnutls: TLS handshake failed (%s)\n\n", + gnutls_strerror (ret)); + return FALSE; + } + + // XXX verify peer + fprintf (stderr, "XXX you must verify the peer\n"); + + /* + * make a new transporter (re-uses xprt) + */ + xprt = makefd_xprt (sock, r->sendsize, r->recvsize, session); +#if 0 + memcpy (&xprt->xp_raddr, &addr, sizeof (addr)); + xprt->xp_addrlen = len; +#endif + return FALSE; /* there is never an rpc msg to be processed */ +} + +static enum xprt_stat +rendezvous_stat (SVCXPRT *xprt __attribute__((unused))) +{ + return XPRT_IDLE; +} + +static void +svctcp_destroy (SVCXPRT *xprt) +{ + struct tcp_conn *cd = (struct tcp_conn *) xprt->xp_p1; + gnutls_session_t session = (gnutls_session_t) xprt->xp_p2; + + gnutls_bye (session, GNUTLS_SHUT_WR); + + xprt_unregister (xprt); + (void) close (xprt->xp_sock); + if (xprt->xp_port != 0) + { + /* a rendezvouser socket */ + xprt->xp_port = 0; + } + else + { + /* an actual connection socket */ + XDR_DESTROY (&(cd->xdrs)); + } + + gnutls_deinit (session); + + mem_free ((caddr_t) cd, sizeof (struct tcp_conn)); + mem_free ((caddr_t) xprt, sizeof (SVCXPRT)); +} + + +/* + * reads data from the tcp connection. + * any error is fatal and the connection is closed. + * (And a read of zero bytes is a half closed stream => error.) + */ +static int +readtcp (char *xprtptr, char *buf, int len) +{ + SVCXPRT *xprt = (SVCXPRT *)xprtptr; + gnutls_session_t session = (gnutls_session_t) xprt->xp_p2; + int sock = xprt->xp_sock; + int milliseconds = 35 * 1000; + struct pollfd pollfd; + + do + { + pollfd.fd = sock; + pollfd.events = POLLIN; + switch (poll (&pollfd, 1, milliseconds)) + { + case -1: + if (errno == EINTR) + continue; + /*FALLTHROUGH*/ + case 0: + goto fatal_err; + default: + if ((pollfd.revents & POLLERR) || (pollfd.revents & POLLHUP) + || (pollfd.revents & POLLNVAL)) + goto fatal_err; + break; + } + } + while ((pollfd.revents & POLLIN) == 0); + + if ((len = gnutls_record_recv (session, buf, len)) > 0) + return len; + + fatal_err: + ((struct tcp_conn *) (xprt->xp_p1))->strm_stat = XPRT_DIED; + return -1; +} + +/* + * writes data to the tcp connection. + * Any error is fatal and the connection is closed. + */ +static int +writetcp (char *xprtptr, char * buf, int len) +{ + SVCXPRT *xprt = (SVCXPRT *)xprtptr; + gnutls_session_t session = (gnutls_session_t) xprt->xp_p2; + + if (gnutls_record_send (session, buf, len) < 0) { + ((struct tcp_conn *) (xprt->xp_p1))->strm_stat = XPRT_DIED; + return -1; + } + + return len; +} + +static enum xprt_stat +svctcp_stat (SVCXPRT *xprt) +{ + struct tcp_conn *cd = + (struct tcp_conn *) (xprt->xp_p1); + + if (cd->strm_stat == XPRT_DIED) + return XPRT_DIED; + if (!xdrrec_eof (&(cd->xdrs))) + return XPRT_MOREREQS; + return XPRT_IDLE; +} + +static bool_t +svctcp_recv (SVCXPRT *xprt, struct rpc_msg *msg) +{ + struct tcp_conn *cd = (struct tcp_conn *) (xprt->xp_p1); + XDR *xdrs = &(cd->xdrs); + + xdrs->x_op = XDR_DECODE; + (void) xdrrec_skiprecord (xdrs); + if (xdr_callmsg (xdrs, msg)) + { + cd->x_id = msg->rm_xid; + return TRUE; + } + cd->strm_stat = XPRT_DIED; /* XXXX */ + return FALSE; +} + +static bool_t +svctcp_getargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr) +{ + return ((*xdr_args) (&(((struct tcp_conn *) + (xprt->xp_p1))->xdrs), args_ptr)); +} + +static bool_t +svctcp_freeargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr) +{ + XDR *xdrs = &(((struct tcp_conn *) (xprt->xp_p1))->xdrs); + + xdrs->x_op = XDR_FREE; + return ((*xdr_args) (xdrs, args_ptr)); +} + +static bool_t +svctcp_reply (SVCXPRT *xprt, struct rpc_msg *msg) +{ + struct tcp_conn *cd = (struct tcp_conn *) (xprt->xp_p1); + XDR *xdrs = &(cd->xdrs); + bool_t stat; + + xdrs->x_op = XDR_ENCODE; + msg->rm_xid = cd->x_id; + stat = xdr_replymsg (xdrs, msg); + (void) xdrrec_endofrecord (xdrs, TRUE); + return stat; +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/svc_gnutls.h 2007-01-29 17:03:24.000000000 +0000 @@ -0,0 +1,17 @@ +/* + * svc_gnutls.h: Interface to the SunRPC over GnuTLS server. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +#ifndef __SVC_GNUTLS_H__ +#define __SVC_GNUTLS_H__ + +extern SVCXPRT *svcgnutls_create (int sock, u_int sendsize, u_int recvsize, + gnutls_certificate_credentials_t x509_cred); + +#endif /* __SVC_GNUTLS_H__ */ --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/svc_tcp2.c 2007-01-30 16:16:32.000000000 +0000 @@ -0,0 +1,426 @@ +/* + * svc_tcp2.c: SunRPC TCP server. This is a very slightly modified + * version of svc_tcp.c from glibc which removes some of the IPv4 + * assumptions, so this version can be used over IPv4 or IPv6 sockets. + * + * Modifications from glibc-2.5 base by Richard Jones <rjones(a)redhat.com>. + */ + +/* @(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC */ +/* + * Sun RPC is a product of Sun Microsystems, Inc. and is provided for + * unrestricted use provided that this legend is included on all tape + * media and as a part of the software program in whole or part. Users + * may copy or modify Sun RPC without charge, but are not authorized + * to license or distribute it to anyone else except as part of a product or + * program developed by the user. + * + * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE + * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun RPC is provided with no support and without any obligation on the + * part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ +#if !defined(lint) && defined(SCCSIDS) +static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro"; +#endif + +/* + * svc_tcp.c, Server side for TCP/IP based RPC. + * + * Copyright (C) 1984, Sun Microsystems, Inc. + * + * Actually implements two flavors of transporter - + * a tcp rendezvouser (a listener and connection establisher) + * and a record/tcp stream. + */ + +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <libintl.h> +#include <rpc/rpc.h> +#include <sys/socket.h> +#include <sys/poll.h> +#include <errno.h> +#include <stdlib.h> + +#ifdef USE_IN_LIBIO +# include <wchar.h> +# include <libio/iolibio.h> +#endif + +#include "svc_tcp2.h" + +/* + * Ops vector for TCP/IP based rpc service handle + */ +static bool_t svctcp_recv (SVCXPRT *, struct rpc_msg *); +static enum xprt_stat svctcp_stat (SVCXPRT *); +static bool_t svctcp_getargs (SVCXPRT *, xdrproc_t, caddr_t); +static bool_t svctcp_reply (SVCXPRT *, struct rpc_msg *); +static bool_t svctcp_freeargs (SVCXPRT *, xdrproc_t, caddr_t); +static void svctcp_destroy (SVCXPRT *); + +static const struct xp_ops svctcp_op = +{ + svctcp_recv, + svctcp_stat, + svctcp_getargs, + svctcp_reply, + svctcp_freeargs, + svctcp_destroy +}; + +/* + * Ops vector for TCP/IP rendezvous handler + */ +static bool_t rendezvous_request (SVCXPRT *, struct rpc_msg *); +static enum xprt_stat rendezvous_stat (SVCXPRT *); +static void svctcp_rendezvous_abort (void) __attribute__ ((__noreturn__)); + +/* This function makes sure abort() relocation goes through PLT + and thus can be lazy bound. */ +static void +svctcp_rendezvous_abort (void) +{ + abort (); +}; + +static const struct xp_ops svctcp_rendezvous_op = +{ + rendezvous_request, + rendezvous_stat, + (bool_t (*) (SVCXPRT *, xdrproc_t, caddr_t)) svctcp_rendezvous_abort, + (bool_t (*) (SVCXPRT *, struct rpc_msg *)) svctcp_rendezvous_abort, + (bool_t (*) (SVCXPRT *, xdrproc_t, caddr_t)) svctcp_rendezvous_abort, + svctcp_destroy +}; + +static int readtcp (char*, char *, int); +static int writetcp (char *, char *, int); +static SVCXPRT *makefd_xprt (int, u_int, u_int); + +struct tcp_rendezvous + { /* kept in xprt->xp_p1 */ + u_int sendsize; + u_int recvsize; + }; + +struct tcp_conn + { /* kept in xprt->xp_p1 */ + enum xprt_stat strm_stat; + u_long x_id; + XDR xdrs; + char verf_body[MAX_AUTH_BYTES]; + }; + +/* + * Usage: + * xprt = svctcp_create(sock, send_buf_size, recv_buf_size); + * + * Creates, registers, and returns a (rpc) tcp based transporter. + * Once *xprt is initialized, it is registered as a transporter + * see (svc.h, xprt_register). This routine returns + * a NULL if a problem occurred. + * + * If sock<0 then a socket is created, else sock is used. + * If the socket, sock is not bound to a port then svctcp_create + * binds it to an arbitrary port. The routine then starts a tcp + * listener on the socket's associated port. In any (successful) case, + * xprt->xp_sock is the registered socket number and xprt->xp_port is the + * associated port number. + * + * Since tcp streams do buffered io similar to stdio, the caller can specify + * how big the send and receive buffers are via the second and third parms; + * 0 => use the system default. + */ +SVCXPRT * +svctcp2_create (int sock, u_int sendsize, u_int recvsize) +{ + bool_t madesock = FALSE; + SVCXPRT *xprt; + struct tcp_rendezvous *r; + struct sockaddr_in addr; + socklen_t len = sizeof (struct sockaddr_in); + + if (sock == RPC_ANYSOCK) + { + if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) + { + perror ("svc_tcp.c - tcp socket creation problem"); + return (SVCXPRT *) NULL; + } + madesock = TRUE; + + bzero ((char *) &addr, sizeof (addr)); + addr.sin_family = AF_INET; + if (bindresvport (sock, &addr)) + { + addr.sin_port = 0; + (void) bind (sock, (struct sockaddr *) &addr, len); + } + if ((getsockname (sock, (struct sockaddr *) &addr, &len) != 0) || + (listen (sock, SOMAXCONN) != 0)) + { + perror ("svc_tcp.c - cannot getsockname or listen"); + if (madesock) + (void) close (sock); + return (SVCXPRT *) NULL; + } + } + r = (struct tcp_rendezvous *) mem_alloc (sizeof (*r)); + xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); + if (r == NULL || xprt == NULL) + { + (void) fprintf (stderr, "svctcp_create: out of memory\n"); + mem_free (r, sizeof (*r)); + mem_free (xprt, sizeof (SVCXPRT)); + return NULL; + } + r->sendsize = sendsize; + r->recvsize = recvsize; + xprt->xp_p2 = NULL; + xprt->xp_p1 = (caddr_t) r; + xprt->xp_verf = _null_auth; + xprt->xp_ops = &svctcp_rendezvous_op; + xprt->xp_port = ntohs (addr.sin_port); + xprt->xp_sock = sock; + xprt_register (xprt); + return xprt; +} + +#if 0 +/* + * Like svtcp_create(), except the routine takes any *open* UNIX file + * descriptor as its first input. + */ +SVCXPRT * +svcfd_create (int fd, u_int sendsize, u_int recvsize) +{ + return makefd_xprt (fd, sendsize, recvsize); +} +#endif + +static SVCXPRT * +makefd_xprt (int fd, u_int sendsize, u_int recvsize) +{ + SVCXPRT *xprt; + struct tcp_conn *cd; + + xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT)); + cd = (struct tcp_conn *) mem_alloc (sizeof (struct tcp_conn)); + if (xprt == (SVCXPRT *) NULL || cd == NULL) + { + (void) fprintf (stderr, "svc_tcp: makefd_xprt: out of memory\n"); + mem_free (xprt, sizeof (SVCXPRT)); + mem_free (cd, sizeof (struct tcp_conn)); + return NULL; + } + cd->strm_stat = XPRT_IDLE; + xdrrec_create (&(cd->xdrs), sendsize, recvsize, + (caddr_t) xprt, readtcp, writetcp); + xprt->xp_p2 = NULL; + xprt->xp_p1 = (caddr_t) cd; + xprt->xp_verf.oa_base = cd->verf_body; + xprt->xp_addrlen = 0; + xprt->xp_ops = &svctcp_op; /* truly deals with calls */ + xprt->xp_port = 0; /* this is a connection, not a rendezvouser */ + xprt->xp_sock = fd; + xprt_register (xprt); + return xprt; +} + +static bool_t +rendezvous_request (SVCXPRT *xprt, + struct rpc_msg *errmsg __attribute__((unused))) +{ + int sock; + struct tcp_rendezvous *r; + struct sockaddr_in addr; + socklen_t len; + + r = (struct tcp_rendezvous *) xprt->xp_p1; +again: + len = sizeof (struct sockaddr_in); + if ((sock = accept (xprt->xp_sock, (struct sockaddr *) &addr, &len)) < 0) + { + if (errno == EINTR) + goto again; + return FALSE; + } + /* + * make a new transporter (re-uses xprt) + */ + xprt = makefd_xprt (sock, r->sendsize, r->recvsize); +#if 0 + memcpy (&xprt->xp_raddr, &addr, sizeof (addr)); + xprt->xp_addrlen = len; +#endif + return FALSE; /* there is never an rpc msg to be processed */ +} + +static enum xprt_stat +rendezvous_stat (SVCXPRT *xprt __attribute__((unused))) +{ + return XPRT_IDLE; +} + +static void +svctcp_destroy (SVCXPRT *xprt) +{ + struct tcp_conn *cd = (struct tcp_conn *) xprt->xp_p1; + + xprt_unregister (xprt); + (void) close (xprt->xp_sock); + if (xprt->xp_port != 0) + { + /* a rendezvouser socket */ + xprt->xp_port = 0; + } + else + { + /* an actual connection socket */ + XDR_DESTROY (&(cd->xdrs)); + } + mem_free ((caddr_t) cd, sizeof (struct tcp_conn)); + mem_free ((caddr_t) xprt, sizeof (SVCXPRT)); +} + + +/* + * reads data from the tcp connection. + * any error is fatal and the connection is closed. + * (And a read of zero bytes is a half closed stream => error.) + */ +static int +readtcp (char *xprtptr, char *buf, int len) +{ + SVCXPRT *xprt = (SVCXPRT *)xprtptr; + int sock = xprt->xp_sock; + int milliseconds = 35 * 1000; + struct pollfd pollfd; + + do + { + pollfd.fd = sock; + pollfd.events = POLLIN; + switch (poll (&pollfd, 1, milliseconds)) + { + case -1: + if (errno == EINTR) + continue; + /*FALLTHROUGH*/ + case 0: + goto fatal_err; + default: + if ((pollfd.revents & POLLERR) || (pollfd.revents & POLLHUP) + || (pollfd.revents & POLLNVAL)) + goto fatal_err; + break; + } + } + while ((pollfd.revents & POLLIN) == 0); + + if ((len = read (sock, buf, len)) > 0) + return len; + + fatal_err: + ((struct tcp_conn *) (xprt->xp_p1))->strm_stat = XPRT_DIED; + return -1; +} + +/* + * writes data to the tcp connection. + * Any error is fatal and the connection is closed. + */ +static int +writetcp (char *xprtptr, char * buf, int len) +{ + SVCXPRT *xprt = (SVCXPRT *)xprtptr; + int i, cnt; + + for (cnt = len; cnt > 0; cnt -= i, buf += i) + { + if ((i = write (xprt->xp_sock, buf, cnt)) < 0) + { + ((struct tcp_conn *) (xprt->xp_p1))->strm_stat = XPRT_DIED; + return -1; + } + } + return len; +} + +static enum xprt_stat +svctcp_stat (SVCXPRT *xprt) +{ + struct tcp_conn *cd = + (struct tcp_conn *) (xprt->xp_p1); + + if (cd->strm_stat == XPRT_DIED) + return XPRT_DIED; + if (!xdrrec_eof (&(cd->xdrs))) + return XPRT_MOREREQS; + return XPRT_IDLE; +} + +static bool_t +svctcp_recv (SVCXPRT *xprt, struct rpc_msg *msg) +{ + struct tcp_conn *cd = (struct tcp_conn *) (xprt->xp_p1); + XDR *xdrs = &(cd->xdrs); + + xdrs->x_op = XDR_DECODE; + (void) xdrrec_skiprecord (xdrs); + if (xdr_callmsg (xdrs, msg)) + { + cd->x_id = msg->rm_xid; + return TRUE; + } + cd->strm_stat = XPRT_DIED; /* XXXX */ + return FALSE; +} + +static bool_t +svctcp_getargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr) +{ + return ((*xdr_args) (&(((struct tcp_conn *) + (xprt->xp_p1))->xdrs), args_ptr)); +} + +static bool_t +svctcp_freeargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr) +{ + XDR *xdrs = &(((struct tcp_conn *) (xprt->xp_p1))->xdrs); + + xdrs->x_op = XDR_FREE; + return ((*xdr_args) (xdrs, args_ptr)); +} + +static bool_t +svctcp_reply (SVCXPRT *xprt, struct rpc_msg *msg) +{ + struct tcp_conn *cd = (struct tcp_conn *) (xprt->xp_p1); + XDR *xdrs = &(cd->xdrs); + bool_t stat; + + xdrs->x_op = XDR_ENCODE; + msg->rm_xid = cd->x_id; + stat = xdr_replymsg (xdrs, msg); + (void) xdrrec_endofrecord (xdrs, TRUE); + return stat; +} --- /tmp/newfile 2007-01-30 17:23:46.000000000 +0000 +++ src/sunrpc/svc_tcp2.h 2007-01-30 16:14:22.000000000 +0000 @@ -0,0 +1,16 @@ +/* + * svc_tcp2.h: Interface to the SunRPC over TCP server. + * + * Copyright (C) 2007 Red Hat, Inc. + * + * See COPYING.LIB for the license of this software. + * + * Richard Jones <rjones(a)redhat.com> + */ + +#ifndef __SVC_TCP2_H__ +#define __SVC_TCP2_H__ + +extern SVCXPRT *svctcp2_create (int sock, u_int sendsize, u_int recvsize); + +#endif /* __SVC_TCP2_H__ */

5 14

[Libvir] Features and roadmap tentative draft
by Daniel Veillard 09 Feb '07

09 Feb '07

We had a meeting this week in the Red Hat team and looked at the work ahead for libvirt. We identified a set of feature that we would like to get in, the time frame (mostly based on Fedora releases schedules) and tried to identify remaining issues: Features when Issues --------------------------------------------------------------------------- KEmu & KVM FC7 Wire API , the way the process is controlled mid feb will probably change, but requires QEmu upstream extensions of the monitor remote access FC8 Naming (URIs), Authentication and wire protocol inetd hook, XML format slight change for dhcp Virtual Network FC7 Sharing QEmu, root priviledge for the daemon isolation Migration FC8 API design Access Control ??? depends on Xen Security Module, KVM equivalent Storage ??? Early concept, will be discussed separately on the mailing-list Sync virsh shutdown FC7 Easy to add in virsh I expect to make a new libvirt release with the KEmu and KVM support as well as a first version of the virtual network support next week. Then the focus will be on remote support and adding migration to the API. Other various issues raised: - URL/drivers, making sure that the last proposal for URI used in remote connection are okay - python bindings: disable automatic generation, handle manually, extend - one Xen driver: currently implemented on top of 3 drivers, clean it up - go though errors, cleaning up duplicates - compile without Xen, once KEmu and KVM support gets added - documentation cleanup: generation and CVS, checkout on libvirt.org - export the config parser API at the shared library with __ prefix since that's used by the daemons but not - semantic of virConnect(NULL) is a bit fuzzy, Xen or default engine ? - Need to plug libxml2 memory routines for memory debug Of course the details will be discussed on the list, but at least it gets a bit clearer where we expect to spend time, but as always other features and feedback is more than welcome, it's needed, so if there is any issue or comments on our viewpoint of the roadmap and feature, please share them :-) Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

2 1

[Libvir] [PATCH] Remove dead code
by Daniel P. Berrange 07 Feb '07

07 Feb '07

The attached patch removes 1000 lines of dead code from xml.c and xend_internal.c. It is not clear that this code was ever used at all in the past, and we certainly don't use or test it today. If we truely need it in the future, we can trivially get it back from the CVS repo. KIlling it now makes its easier to maintain the code base because we're not obscuring active code with historical cruft. Finally it will also make the code coverage reporting more useful since it won't be complaining about untested code we never use. Any objections to me applying this ? 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

Re: [Libvir] what is virt-install doing differently?
by Aron Griffis 31 Jan '07

31 Jan '07

Hi Daniel, Daniel P. Berrange wrote: [Tue Jan 23 2007, 10:49:07AM EST] > For HVM installs, the different should only be the addition of the > CDROM device. If you take a look in /var/log/xen/xend.log it should > show you the final SEXPR that XenD is getting when creating the > guest. Comparing the SEXPR seen when booting the config file, vs > that generated by virt-intsall may shed some more light on the > problem. > > Also, virt-install has a --debug flag which will make it show the libvirt > XML description it used to boot. Thanks for these suggestions. Yongkang looked at xend.log and found this: You, Yongkang wrote: [Thu Jan 25 2007, 10:26:33AM EST] > Thanks for the information. I have check /var/log/xen/xend.log. > Found something interesting. When using virt-install to install VTI > domain, it seemed didn't parse the right vcpu number to qemu-dm. > Please look at the following log: > > 1. The spawning qemu log, when installation by virt-intall with vcpu=4: > --------------------- > [2007-01-25 23:14:13 xend 2817] INFO (image:418) spawning device models: /usr/lib/xen/bin/qemu-dm ['/usr/lib/xen/bin/qemu-dm', '-d', '9', '-m', '1024', '-boot', 'c', '-acpi', '-domain-name', 'test', '-net', 'nic,vlan=1,macaddr=00:16:3e:0a:d2:86,model=rtl8139', '-net', 'tap,vlan=1,bridge=xenbr0', '-vncunused', '-vnclisten', '127.0.0.1'] > ~~~~~~~~~~~~ > > 2. The spawning qemu log, when use command "xm create": > ------------------------ > [2007-01-25 17:13:13 xend 2817] INFO (image:418) spawning device models: /usr/lib/xen/bin/qemu-dm ['/usr/lib/xen/bin/qemu-dm', '-d', '7', '-m', '1024', '-boot', 'd', '-vcpus', '4', '-acpi', '-domain-name', 'ExampleVTIDomain', '-net', 'nic,vlan=1,macaddr=00:16:3e:31:42:c4,model=rtl8139', '-net', 'tap,vlan=1,bridge=xenbr0', '-vncviewer'] > ~~~~~~~~~~~ > > There is "-vcpus 4" in the 2nd log. It means qemu would create up > a 4 vpucs VTI domain. > > For the situation 1, although qemu doesn't get any information about > "vcpu=4". But xen has already prepared 2 vcpus to qemu. Will it be > the problem? I'm looking through the code now to see if I can find where this is going awry, but while I'm looking, does this ring a bell for you? Thanks, Aron

2 2

[Libvir] libvirtd - configuration file
by Richard W.M. Jones 31 Jan '07

31 Jan '07

Libvirtd needs a configuration file. It's very simple - just to store the services on which it's listening, and optionally to configure port numbers and paths. Libvirt so far doesn't have a concept of a configuration file, except that obviously domain descriptions come out of XML files. Do people on list have a preference for a style of configuration file? An alternative is to configure entirely via the command line. Rich. PS: Personally when administering a machine there is nothing worse than finding an XML configuration file ... -- 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)

4 3

[Libvir] Problem in configuring libvirt (Xen store library not found)
by aditya aekkaldevi 31 Jan '07

31 Jan '07

Hello, First of all I am a newbie to linux. I installed Red hat enterprise 5 beta 2 which has xen. So in order to start xen I had to install libvirt as it is needed by virt-install command. But I am getting an error while configuring libvirt software. The error is "Xen store library not found". I am getting this error after a check for library containing xs_read failed. So how can I configure and install libvirt now. Please let me know the solution for this ASAP. Also, if I am doing anything wrong, please let me know. Thanks in advance Aditya

3 2

[Libvir] Automated build script
by Daniel P. Berrange 31 Jan '07

31 Jan '07

I'm going to setup libvirt to be part of an automated build system[1] which will checkout the code, perform a build, run tests, etc, etc on a 24x7 basis. This merely requires adding a single file 'autobuild.sh' to the top level directory to perform the neccessary build/test tasks (see attached file). As part of this automation I'll have it setup to run all the test suites under valgrind which should let us identify memory leaks sooner. Finally I also plan to add in the Makefile rules[2] neccessary to run gcov so as to enable reports to be generated on test suite coverage. Regards, Dan. [1] http://autobuild.org/ [2] Hmm, i'm sure i sent such a patch before but can't find any trace of it in the mail archives. -- |=- 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 -=|

1 0

[Libvir] Nothing ever calls the driver ->init function, right?
by Richard W.M. Jones 31 Jan '07

31 Jan '07

... or at least I can't see it being called anywhere. 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 5

[Libvir] Issue with creating domains that use pygrub
by Chris Halstead 30 Jan '07

30 Jan '07

I'm stumped. I'm trying to automate creation of domains through libvirt and the Python bindings, but I'm having trouble getting things to work when using pygrub. If I define an XML-described domain and use <bootloader>/usr/bin/pygrub</bootloader> the domain tries to start and then immediately crashes. Using explicit local-pathed vmlinuz/initrd without the bootloader element works just fine. Am I missing something? The version of libvirt on my test system in 0.1.9. Thanks! C. Halstead <chris(a)sourcelabs.com> SourceLabs - http://www.sourcelabs.com Dependable Open Source Systems

2 2

[Libvir] Option string in getopt_long wrong?
by Richard W.M. Jones 30 Jan '07

30 Jan '07

while ((arg = getopt_long(end, argv, "d:hqtv", opt, &idx)) != -1) { ------ switch (arg) { case 'd': ctl->debug = atoi(optarg); break; case 'h': help = 1; break; case 'q': ctl->quiet = TRUE; break; case 't': ctl->timing = TRUE; break; case 'c': ctl->name = vshStrdup(ctl, optarg); break; // etc Shurley shome mishtake? 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 3

[Libvir] Virtual networking
by Mark McLoughlin 29 Jan '07

29 Jan '07

Hi, Dan and I have been discussing how to "fix networking", not just Xen's networking but also getting something sane wrt. QEMU/KVM etc. Comments very welcome on the writeup below. The libvirt stuff is towards the end, but I think all of it is probably useful to this list. Cheers, Mark. Virtual Networking The ability to manage virtual machines is something which is receiving a lot of focus right now. Xen, KVM, QEMU and others provide the infrastructure required to run a virtual machine, and each can provide guests with a virtual network interface. This proposal addresses the problem of how guests are networked together. We aim: * To make virtual networking "just work". Guests should be able to communicate with each other, their host and the Internet without any fuss or configuration. This should be the case even with laptops and offline machines. * To allow a greater flexibily with how guests are networked. It should be possible to isolate groups of guests in different networks, allow guests on different physical machines to communicate, firewall guests' networks from physical networks or allow guests to appear just like physical machines on physical networks. * To make networking virtual machines analogous with networking physical machines. * To support inter-networking between virtualisation technologies. User Visible Concepts ===================== It's important to consider the manner in which we expose the functionality of virtual networking. What concepts will be exposing through the UI? Are those concepts well defined and consistent? Are those concepts more complex than neccessary? Or are the too simple to be able to support the functionality we want? Real world, or "physical", concepts[1]: * Network - a number of interconnected machines. * Network Interface - hardware which enables a machine to connect to a network. * Bridge - hardware which allows enables the interconnection of machines to form a network. Bridges can also be connected to other bridges to form a larger network. * Router - hardware which connects two or more distinct networks, allowing machines on different networks to communicate with one another. Sometimes a router and a bridge are available as a combined piece of hardware - the bridge forms a network and the router connects that network to another distinct network. * Firewall - software on a router which can be used to control how machines on an "external" network (e.g. the Internet) can communicate with machines on an "internal" network. For a given type of connection, you can choose to disallow connections of a that type or forward them to a specific internal machine. Can also be used to control how internal machines can communicate with external machines. With virtual networking, we will be exposing the following "virtual" concepts: * Virtual Network - a number of interconnected virtual machines. * Virtual Network Interface - a network interface in a virtual machine. * Virtual Bridge - allows the interconnection of virtual machines to form a virtual network. A virtual bridge may be configured to also act as a virtual router and firewall. A virtual bridge may also be connected to another virtual bridge (perhaps on another physical machine) to create a larger virtual network. (Note, unprivileged users may create any of the above) Finally, where the physical world meets the virtual world: * Shared Physical Interface - if a physical interface is configured to be "shared", then any number of virtual interfaces may be connected to it allowing virtual machines to be connected to the same physical network which the physical interface is connected to. Only privileged users may configure a physical interface to be shared and/or connect guests to it. There are a few problems with all of the above: 1. The distinction between a bridge and a router requires a lot of technical knowledge to fully understand. However, the model of e.g. a LinkSys router is familiar to a lot of people - a box which allows you to network your machines together and connect that network to (and firewall off) the Internet. 2. This "shared physical interface" notion is very "makey upey". We could perhaps talk about the idea in terms of connecting a physical interface to a virtual bridge, but it exposes the bridge vs. router distinction more than we'd like. 3. Guests are connected to a specific physical interface, whereas perhaps users wish guests to be connected to "the network" - i.e. if NetworkManager switched from wireless to wired while remaining on the same subnet, perhaps we'd like to automatically switch the bridge to the new network. In reality, though, bridged networking is only really sane for machines on a fairly static network connection. [1] - Yes, these definitions aren't entirely accurate, but they describe the kind of understanding a moderately technical user might have of the concepts. Example Networks ================ Below are some example networks users may configure and an explanation of how that network would be implemented in practice. 1. A privileged user creates two (Xen) guests, each with a Virtual Network Interface. Without any special networking configuration, these two guests are connected to a default Virtual Network which contains a combined Virtual Bridge/Router/Firewall. +-----------+ D +-----------+ | Guest | N D H | Guest | | A | A N C | B | | +---+ | T S P | +---+ | | |NIC| | ^ ^ ^ | |NIC| | +---+-+-+---+ +---+---+ +---+-+-+---+ ^ | ^ | +--------+ +---+---+ +--------+ | +-->+ vif1.0 +----+ vnbr0 +----+ vif2.0 +<--+ +--------+ +-------+ +--------+ Notes: * "vnbr0" is a bridge device with it's own IP address on the same subnet as the guests. * IP forwarding is enabled in Dom0. Masquerading and DNAT is implemented using iptables. * We run a DHCP server and a DNS proxy in Dom0 (e.g. dnsmasq) 2. A privileged user does exactly the same thing as (1), but with QEMU guests. D N D H A N C T S P ^ ^ ^ +---+---+ | +---+---+ +-----------+ | vnbr0 | +-----------+ | Guest | +---+---+ | Guest | | A | | | B | | +---+ | +---+---+ | +---+ | | |NIC| | | vtap0 | | |NIC| | +---+-+-+---+ +---+---+ +---+-+-+---+ ^ +-------+ | +-------+ ^ | | | +---+---+ | | | +------>+ VLAN0 +-+ VDE +-+ VLAN0 +<------+ | | +-------+ | | +-------+ +-------+ Notes: * VDE is a userspace ethernet bridge implemented using vde_switch * "vtap0" is a TAP device created by vde_switch * Everything else is the same as (1) * This could be done without vde_switch by having Guest A create vtap0 and have Guest B connect directly to Guest A's VLAN. However, if Guest A is shut down, Guest B's network would go down. 3. An unprivileged user does exactly the same thing as (2). +-----------+ +-----------+ | Guest | +----+----+ | Guest | | A | |userspace| | B | | +---+ | | network | | +---+ | | |NIC| | | stack | | |NIC| | +---+-+-+---+ +----+----+ +---+-+-+---+ ^ +-------+ | +-------+ ^ | | | +---+---+ | | | +------>+ VLAN0 +-+ VDE +-+ VLAN0 +<------+ | | +-------+ | | +-------+ +-------+ Notes: * Similar to (2) except there is can be no TAP device or bridge * The userspace network stack is implemented using slirpvde to provide a DHCP server and DNS proxy to the network, but also effectively a SNAT and DNAT router. * slirpvde implements ethernet, ip, tcp, udp, icmp, dhcp, tftp (etc.) in userspace. Completely crazy, but since the kernel apparently has no secure way to allow unprivileged users to leverage the kernel's network stack for this, then it must be done in userspace. 4. Same as (2), except the user also creates two Xen guests. +-----------+ D +-----------+ | Guest | N D H | Guest | | A | A N C | B | | +---+ | T S P | +---+ | | |NIC| | ^ ^ ^ | |NIC| | +---+-+-+---+ +---+---+ +---+-+-+---+ ^ | ^ | +--------+ +---+---+ +--------+ | +-->+ vif1.0 +----+ vnbr0 +----+ vif2.0 +<--+ +--------+ +---+---+ +--------+ | +---+---+ | vtap0 | +---+---+ | +-------+ +--+--+ +-------+ +---->+ VLAN0 +----+ VDE +---+ VLAN0 +<-----+ | +-------+ +-----+ +-------+ | V V +---+-+-+---+ +---+-+-+---+ | |NIC| | | |NIC| | | +---+ | | +---+ | | Guest | | Guest | | C | | D | +-----------+ +-----------+ Notes: * In this case we could do away with VDE and have each QEMU guest use its own TAP device. 5. Same as (3) except Guests A and C are connected to a Shared Physical Interface. +-----------+ | D +-----------+ | Guest | ^ | N D H | Guest | | A | | | A N C | B | | +---+ | +---+---+ | T S P | +---+ | | |NIC| | | eth0 | | ^ ^ ^ | |NIC| | +---+-+-+---+ +---+---+ | +---+---+ +---+-+-+---+ ^ | | | ^ | +--------+ +---+---+ | +---+---+ +--------+ | +>+ vif1.0 +-+ ebr0 + | + vnbr0 +-+ vif2.0 +<-+ +--------+ +---+---+ | +---+---+ +--------+ | | | +---+---+ | +---+---+ | vtap1 | | | vtap0 | +---+---+ | +---+---+ | | | +-------+ +--+--+ | +--+--+ +-------+ +->+ VLAN0 +--+ VDE + | + VDE +--+ VLAN0 +<-+ | +-------+ +-----+ | +-----+ +-------+ | V | V +---+-+-+---+ | +---+-+-+---+ | |NIC| | | | |NIC| | | +---+ | | | +---+ | | Guest | | | Guest | | C | | | D | +-----------+ | +-----------+ Notes: * The idea here is that when the admin configures eth0 to be shareable, eth0 is configured as an addressless NIC enslaved to a bridge which has the MAC address and IP address that eth0 should have * Again, VDE is redundant here. 6. Same as 2) except the QEMU guests are on a Virtual Network on another physical machine which is, in turn, connected to the Virtual Network on the first physical machine +-----------+ D +-----------+ | Guest | N D H | Guest | | A | A N C | B | | +---+ | T S P | +---+ | | |NIC| | ^ ^ ^ | |NIC| | +---+-+-+---+ +---+---+ +---+-+-+---+ ^ | ^ | +--------+ +---+---+ +--------+ | +-->+ vif1.0 +----+ vnbr0 +----+ vif2.0 +<--+ +--------+ +---+---+ +--------+ | +---+---+ | vtap0 | +---+---+ | +--+--+ | VDE | +--+--+ | First Physical Machine V ------------------------------------------------------------- Second Physical Machine ^ | +-------+ +--+--+ +-------+ +---->+ VLAN0 +----+ VDE +---+ VLAN0 +<-----+ | +-------+ +-----+ +-------+ | V V +---+-+-+---+ +---+-+-+---+ | |NIC| | | |NIC| | | +---+ | | +---+ | | Guest | | Guest | | C | | D | +-----------+ +-----------+ Notes: * What's going on here is that the two VDEs are connected over the network, either via a plan socket or perhaps encapsulated in another protocol like SSH or TLS One interesting thing to note from all of those examples is that although QEMU's networking options are very interesting, it doesn't actually make sense for a network to be implemented inside a guest. The network needs to be external to any guests, and so we use VDE to offer similar networking options to the ones QEMU provides. All QEMU needs to be able to do is to connect to VDE. User Interface ============== This isn't meant a UI specification, but just some notes on how this stuff might be exposed in virt-manager. * Networks List: * Name * Virtual/Physical * Status * Activity/traffic * Virtual Network Configuration: * Name * List of connected guests * Allow other Virtual Networks to connect to this (defaults to no) * Connect to other Virtual Network (defaults to none) * DHCP enabled - DHCP configuration: * IP range (optional) * Router IP address (optional) * Guest IP address/hostname assignment (optional) * Forwarding enabled - firewall configuration: * Incoming ports list and destination guest+port for each (defaults to empty) * Blocked outgoing ports lists (defaults to empty) * Virtual NICs list: * Guest interface name * Virtual Network/Shared Physical Interface * Hostname (defaults to guest name) * IP address (if assigned) * MAC address (if assigned) * Virtual NIC Configuration: * Random MAC address, or user-supplied MAC address. * Virtual Network or Shared Physical Interface to connect to. Implementation ============== Parity with the current state of networking with Xen will be achieved by: * Implementing "shared physical interface" support in Fedora's initscripts and network configuration tool. It boils down to configuring the interface (e.g. eth0) something like: ifcfg-peth0: DEVICE=peth0 ONBOOT=yes Bridge=eth0 HWADDR=00:30:48:30:73:19 ifcfg-eth0 DEVICE=eth0 Type=Bridge ONBOOT=yes BOOTPROTO=dhcp * Fixing Xen so that netloop is no longer required. Upstream have ideas about how to make Xen automatically copy any frames that are destined for Dom0 so that the netback driver doesn't run out of shared pages if Dom0 doesn't process the frames quickly enough. * Create new network/vif scripts for Xen which will connect guests to a shared physical interface's bridge. Virtual Networks will be implemented in libvirt. First, there will be an XML description of Virtual Networks e.g.: <network id="0"> <name>Foo</name> <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid> <listen address="172.31.0.5" port="1234" /> <connections> <connection address="172.31.0.6" port="4321" /> </conections> <dhcp enabled="true"> <ip address="10.0.0.1" netmask="255.255.255.0" start="10.0.0.128" end="10.0.0.254" /> </dhcp> <forwarding enabled="true"> <incoming default="deny"> <allow port="123" domain="foobar" destport="321" /> </incoming> <outgoing default="allow"> <deny port="25" /> </outgoing> </forwarding> <network> In a manner similar to libvirt's QEMU support, there will be a daemon to manage Virtual Networks. The daemon will have access to a store of network definitions. The daemon will be responsible for managing the bridge devices, vde_switch/dhcp/dnses processes and the iptables rules needed for SNAT/DNAT etc. virsh command line interface would look like: $> virsh network-create foo.xml $> virsh network-dumpxml > foo.xml $> virsh network-define foo.xml $> virsh network-list $> virsh network-start Foo $> virsh network-stop Foo $> virsh network-restart Foo The libvirt API for virtual networks would be modelled on the API for virtual machines: /* * Virtual Networks API */ /** * virNetwork: * * a virNetwork is a private structure representing a virtual network. */ typedef struct _virNetwork virNetwork; /** * virNetworkPtr: * * a virNetworkPtr is pointer to a virNetwork private structure, this is the * type used to reference a virtual network in the API. */ typedef virNetwork *virNetworkPtr; /** * virNetworkCreateFlags: * * Flags OR'ed together to provide specific behaviour when creating a * Network. */ typedef enum { VIR_NETWORK_NONE = 0 } virNetworkCreateFlags; /* * List active networks */ int virConnectNumOfNetworks (virConnectPtr conn); int virConnectListNetworks (virConnectPtr conn, int *ids, int maxids); /* * List inactive networks */ int virConnectNumOfDefinedNetworks (virConnectPtr conn); int virConnectListDefinedNetworks (virConnectPtr conn, const char **names, int maxnames); /* * Lookup network by name, id or uuid */ virNetworkPtr virNetworkLookupByName (virConnectPtr conn, const char *name); virNetworkPtr virNetworkLookupByID (virConnectPtr conn, int id); virNetworkPtr virNetworkLookupByUUID (virConnectPtr conn, const unsigned char *uuid); virNetworkPtr virNetworkLookupByUUIDString (virConnectPtr conn, const char *uuid); /* * Create active transient network */ virNetworkPtr virNetworkCreateXML (virConnectPtr conn, const char *xmlDesc, unsigned int flags); /* * Define inactive persistent network */ virNetworkPtr virNetworkDefineXML (virConnectPtr conn, const char *xmlDesc); /* * Delete persistent network */ int virNetworkUndefine (virNetworkPtr network); /* * Activate persistent network */ int virNetworkCreate (virNetworkPtr network); /* * Network destroy/free */ int virNetworkDestroy (virNetworkPtr network); int virNetworkFree (virNetworkPtr network); /* * Network informations */ const char* virNetworkGetName (virNetworkPtr network); unsigned int virNetworkGetID (virNetworkPtr network); int virNetworkGetUUID (virNetworkPtr network, unsigned char *uuid); int virNetworkGetUUIDString (virNetworkPtr network, char *buf); char * virNetworkGetXMLDesc (virNetworkPtr network, int flags); Discussion points on the XML format and API: * The XML format isn't thought out at all, but briefly: * The <listen> and <connections> elements describe networks connected across physical machine boundaries. * The <dhcp> element describes the configuration of the DHCP server on the network. * The <forwarding> element describes how incoming and outgoing connections are forwarded. * Since virConnect is supposed to be a connection to a specific hypervisor, does it make sense to create networks (which should be hypervisor agnostic) through virConnect? * Are we needlessly replicating any mistakes from the domains API here? e.g. is the transient vs. persistent distinction useful for networks? * Is a UUID useful for networks? Yes, because it distinguishes between networks of the same name on different hosts? * Where is the connection between domains and networks in either the API or the XML format? How is a domain associated with a network? You put a bridge name in the <network&gtl definition and use that in the domains <interface> definition? Or you put the network name in the interface definition and have libvirt look up the bridge name when creating the guest? * Should it be possible to stop/start/restart a network? What for? If something breaks the user restarts it to see if that will fix it?

7 59

[Libvir] Add 'console' and 'vncdisplay' commands to virsh
by Daniel P. Berrange 29 Jan '07

29 Jan '07

The attached patch adds two new commands to virsh: - console - connects to the guest's serial console - vncdisplay - outputs the ip address & port number of a guest vnc display The former is another stage in eliminating the need to run 'xm' - replacing the Xen specific 'xm console' code, with the added advantage of working with any libvirt backend driver. The vncdisplay is intended to make it easier for people to launch a VNC viewer process. It prints out a IP address & port number in a format suitable for passing to vncviewer on the command line, eg vncviewer `virsh vncdisplay myguest` 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 3

[Libvir] Dom0 hypercall ABI changes in xen-unstable ?
by Daniel P. Berrange 28 Jan '07

28 Jan '07

This changeset concerns me in today's xen-unstable http://xenbits2.xensource.com/xen-unstable.hg?rev/30af6cfdb05c "Make domctl/sysctl interfaces 32-/64-bit invariant. This kills off a fair amount of unpleasant CONFIG_COMPAT shimming and avoids needing to keep the compat paths in sync as these interfaces continue to develop." For example @@ -81,9 +81,9 @@ struct xen_sysctl_physinfo { uint32_t sockets_per_node; uint32_t nr_nodes; uint32_t cpu_khz; - uint64_t total_pages; - uint64_t free_pages; - uint64_t scrub_pages; + uint64_aligned_t total_pages; + uint64_aligned_t free_pages; + uint64_aligned_t scrub_pages; uint32_t hw_cap[8]; Suggests to me that alignment of thse fields may now have changed on 32-bit hosts. Well, at least it would if it were not for public/xen.h doing: #define uint64_aligned_t uint64_t So has it changed or not ? The interface version was incremented at least... -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000004 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000005 -#define XEN_SYSCTL_INTERFACE_VERSION 0x00000002 +#define XEN_SYSCTL_INTERFACE_VERSION 0x00000003 I'm expecting the worst in terms of ABI compat, but I'm really not at all certain yet. 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 -=|

1 1

[Libvir] Patch: In autogen.sh, if configure fails, don't continue with instructions
by Richard W.M. Jones 26 Jan '07

26 Jan '07

http://et.redhat.com/~rjones/patches/libvirt-autogen-configure-failure.patch (Very trivial ...) 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)

2 1

[Libvir] libvirt and accessing remote systems
by Richard W.M. Jones 25 Jan '07

25 Jan '07

This is a follow on to this thread: https://www.redhat.com/archives/libvir-list/2007-January/thread.html#00064 but I think it deserves a thread of its own for discussion. Background: Dan drew this diagram proposing a way to include remote access to systems from within libvirt: http://people.redhat.com/berrange/libvirt/libvirt-arch-remote-2.png libvirt would continue as now to provide direct hypervisor calls, direct access to xend and so on. But in addition, a new backend would be written ("remote") which could talk to a remote daemon ("libvirtd") using some sort of RPC mechanism. Position: I gave this architecture some thought over the weekend, and I like it for the following reasons (some not very technical): * Authentication and encryption is handled entirely within the libvirt / libvirtd library, allowing us to use whatever RPC mechanism we like on top of a selection of transports of our choosing (eg. GnuTLS, ssh, unencrypted TCP sockets, ...) * We don't need to modify xend at all, and additionally we won't need to modify future flavour-of-the-month virtual machine monitors. I have a particular issue with xend (written in Python) because in my own tests I've seen my Python XMLRPC/SSL server actually segfault. It doesn't inspire me that this Python solution is adding anything more than apparent security. * The architecture is very flexible: It allows virt-manager to run as root or as non-root, according to customer wishes. virt-manager can make direct HV calls, or everything can be remoted, and it's easy to explain to the user about the performance vs management trade-offs. * It's relatively easy to implement. Note that libvirtd is just a thin server layer linked to its own copy of libvirt. * Another proposal was to make all libvirt calls remote (http://people.redhat.com/berrange/libvirt/libvirt-arch-remote-3.png) but I don't think this is a going concern because (1) it requires a daemon always be run, which is another installation problem and another chance for sysadmins to give up, and (2) the perception will be that this is slow, whether or not that is actually true. Now some concerns: * libvirtd will likely need to be run as root, so another root daemon written in C listening on a public port. (On the other hand, xend listening on a public port also isn't too desirable, even with authentication). * If Xen upstream in the meantime come up with a secure remote access method then potentially this means clients could have to choose between the two, or run two services (libvirtd + Xen/remote). * There are issues with versioning the remote API. Do we allow different versions of libvirt/libvirtd to talk to each other? Do we provide backwards compatibility when we move to a new API? * Do we allow more than one client to talk to a libvirtd daemon (no | multiple readers one writer | multiple readers & writers). * What's the right level to make a remote API? Should we batch calls up together? RPC mechanism: I've been investigating RPC mechanisms and there seem to be two reasonable possibilities, SunRPC and XMLRPC. (Both would need to run over some sort of secure connection, so there is a layer below both). My analysis of those is here: http://et.redhat.com/~rjones/secure_rpc/ Rich. -- Red Hat UK Ltd. 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 (will change soon)

4 10

[Libvir] what is virt-install doing differently?
by Aron Griffis 23 Jan '07

23 Jan '07

I'm looking at a problem where HVM xen/ia64 domains hang on boot using virt-install, specifically at this point: ACPI: Core revision 20060707 Boot processor id 0x0/0x0 Given VT-I capable hardware, this can be demonstrated with: virt-install -n rhel5hvm1 -v -r 1024 --vcpus=2 -c \ /root/RHEL5-Server-20070112.3-ia64-DVD.iso -f \ /var/lib/xen/images/rhel5hvm1 -s 20 --vnc The really strange thing is that the boot works fine, using the same configuration, if virt-install is not involved. Actually, I modify the configuration slightly to include the CD-ROM, but otherwise it is the same: # cat /etc/xen/rhel5rc1s7hvm2 # Automatically generated xen config file name = "rhel5rc1s7hvm2" builder = "hvm" memory = "1024" disk = [ 'phy:/dev/cciss/c0d1p1,hda,w', 'file:/root/RHEL5-Server-20070112.3-ia64-DVD.iso,hdc:cdrom,r' ] vif = [ 'type=ioemu, mac=00:16:3e:50:4c:95, bridge=xenbr1', ] uuid = "c228739b-9e6c-bb11-47d8-281ca2edf750" device_model = "/usr/lib/xen/bin/qemu-dm" kernel = "/usr/lib/xen/boot/hvmloader" vnc=1 vncunused=1 apic=1 acpi=1 vcpus=2 serial = "pty" # enable serial console on_reboot = 'restart' on_crash = 'restart' I don't understand what would be different about the virt-install boot vs. booting straight from the generated configuration. Can somebody shed some light on this? Thanks, Aron

2 1

[Libvir] virtinst 0.100.0 and virt-manager 0.3.0 releases
by Daniel P. Berrange 23 Jan '07

23 Jan '07

Following on from the recent libvirt 0.1.11 release, I'm pleased to announce new releases of the virtinst & virt-manager applications. The virtinst 0.100.0 release is a major re-factoring to make use of the libvirt inactive domain management APIs when provisioning guests. It also tries to clean up many of the Xen specific bits to facilitate future use with the QEMU backend of libvirt. From a usability point of view it also now displays progress information when downloading kernel & initrd and creating the filesystem images. The virt-manager 0.3.0 release brings a major functionality update, enabling of inactive domain management. This requires libvirt at least version 0.1.11 to provide implementations of inactive domain management for Xen 3.0.3 and Xen 3.0.4. With this new functionality the display will list all guests which are in the 'shutoff' state. The guest can be started with the 'Run' button in the virtual console window. The vistinst package must also be updated to at least version 0.100.0 to ensure that during provisioning of guests it uses the new inactive domain management APIs. Finally there have been a variety of minor UI fixes & enhancements such as progress bars during guest creation, reliability fixes to the virtual console and even greater coverage for translations. As of today, virtinst is now formally a part of the virt-manager project, so downloads for both virtinst & virt-manager are available from the same download page: http://virt-manager.et.redhat.com/downloads.html All historical release from virtinst 0.95.0 onwards are available there. In addition, to encourage / facilitate broader community development & feedback on the virtinst/virt-manager applications we have decided to designate et-mgmt-tools(a)redhat.com as the project primary mailing list: http://www.redhat.com/mailman/listinfo/et-mgmt-tools We welcome feedback on what additional capabilities / features people would like to see in future virtinst / virt-manager releases. As a taste of things to come, we have active developments plans for: - Secure authenticated remote management - Support for QEMU & KVM virtualization 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 -=|

1 1

[Libvir] Release of libvirt-0.1.11
by Daniel Veillard 22 Jan '07

22 Jan '07

I just made a release, last one was one month ago, there is a leak fixed and this make it simpler to commit new code for QEmu and remote support: * Finish XML XM config files support (Daniel Berrange) * Remove memory leak when freeing virConf objects (Daniel Berrange) * Finishing inactive domain support (Daniel Berrange) * Added a Relax-NG schemas to check XML instances Available as usual at ftp://libvirt.org/libvirt/ thanks everybody ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] Tricky provisioning problem with inactive domains
by Daniel P. Berrange 17 Jan '07

17 Jan '07

Adding support for inactive domains was supposed to make everyone's life easier, but as luck would have it, its actually made one thing very much harder. In the virt-inst/virt-manager tools provisioning works something like this: In paravirt case: - Create a guest using an explicit kernel/initrd from the images/xen directory on the install CD - Write a config file to /etc/xen setup to boot using pygrub In fullvirt case: - Create a guest booting directly off a CDROM - Write a config file to /etc/xen setup to boot off the harddisk So in both these cases, the libvirt XML config for the very first boot of the guest is different, from the XML config for subsequent boots. With the new inactive domain support in libvirt & xend, we can't write out config files directly, instead there is the virDomainDefine() API, which calls to appropriate APIs in XenD. And this is where the problem arises: 1. If we call virDomainDefine() to write the long term config, then virDomainStart() will not be using the correct boot method for the initial install. 2. If we call virDomainDefine() to write the initial install config, then virDomainStart() will kick off the install correctly, but on subsequent boots we'll end up booting the installer again instead of the just installed OS. 3. We could just use virDomainCreate() to start installer, and try to use virDomainDefine() to write the long term config - the latter call will fail though because there will already be a running guest with that name. 4. Conversely if we use virDomainDefine() to write the config, and then tried to create a one-off guest with virDomainCreate() the latter will fail due to duplicate names. So, thus far the only way out of the trap I can think of is: 1. Use virDomainCreate() to kick off the initial install 2. Poll virDomainLookupByXXX() to watch for this initial guest shutting down 3. Write out the persistent config using virDomainDefine() The big problem with this, is that if the user were to exit virt-manager sometime after the guest install starts, but before step 3, the config for the guest will never be written, even though it has successfully installed. There are two further ideas I've had - both requiring additional APIs in libvirt & probably XenD too. - Make it possible change the boot configuration of an existing guest. This would let us do: 1. Use virDomainDefine() to define a config file suitable for installing the guest, ie using explicit kernel/initrd 2. Use virDomainStart() to kick off the installer 3. Uew new API to change the guest config to remove explicit kernel & initrd config, and add a bootloader for pygrub. Or in HVM case, switch boot order to use harddisk instead of CDROM & detach the CDROM device. - Make it possible to start an existing inactive guest using an alternative one-off configuration. This would let us do: 1. Use virDomainDefine() to define a config file suitable for running the guest during normal operation. 2. Use virDomainStartConfig(xml) to start the guest with a special config suitable for installing the guest. Ultimately I think we do need the means to change arbitrary parts of a guest configuration, so I think the first option would be the preferred approach. The trouble is that I think implementing this would require using the new XenAPI, or adding a number of new methods to the legacy SXPR API which is not really very desirable. 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 -=|

5 7

Re: [Libvir] Virtual networking
by Richard W.M. Jones 16 Jan '07

16 Jan '07

Hugh Brock wrote: > Daniel P. Berrange wrote: > >> 3. The way I think you re suggesting - a libvirt server on every remote >> host which calls into the regular libvirt internal driver model to >> proxy remote calls. So even if the hypervisor in question provides a >> remote network management API, we will always use the local API and >> do *all* remote networking via the libvirt server >> >> http://people.redhat.com/berrange/libvirt/libvirt-arch-remote-2.png >> > This strikes me as *much* easier to manage, and the most consistent > thus far with the idea that libvirt should remain as > hypervisor-neutral as possible. I guess the management issue is going to be versioning the protocol. If the protocol is just a direct mapping of vir* calls and structures then you'll quickly end up in a situation where even the smallest change requires you to upgrade the world or old versions have to be maintained indefinitely. That's not saying I don't like the idea. Rich. -- Red Hat UK Ltd. 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 (will change soon)

2 1

Re: [Libvir] Virtual networking
by Hugh Brock 16 Jan '07

16 Jan '07

Richard W.M. Jones wrote: > Hugh Brock wrote: >> Daniel P. Berrange wrote: >>> 3. The way I think you re suggesting - a libvirt server on every remote >>> host which calls into the regular libvirt internal driver model to >>> proxy remote calls. So even if the hypervisor in question provides a >>> remote network management API, we will always use the local API and >>> do *all* remote networking via the libvirt server >>> >>> http://people.redhat.com/berrange/libvirt/libvirt-arch-remote-2.png >>> >> This strikes me as *much* easier to manage, and the most consistent >> thus far with the idea that libvirt should remain as >> hypervisor-neutral as possible. > > I guess the management issue is going to be versioning the protocol. If > the protocol is just a direct mapping of vir* calls and structures then > you'll quickly end up in a situation where even the smallest change > requires you to upgrade the world or old versions have to be maintained > indefinitely. > > That's not saying I don't like the idea. > True enough... we're guaranteeing we're going to have backwards compatibility problems. On the other hand the libvirt API is supposed to be held pretty stable. DV, any thoughts? --H

1 0

Re: [Libvir] Certificate management APIs ?
by Richard W.M. Jones 16 Jan '07

16 Jan '07

[Apologies also that this is not threaded with the original post] > $HOME/.libvirt/tls/ > | > +- ca > | | > | +- cert.pem > | +- ca-crl.pem Note that there are standard locations for CA certs. On my Debian box the standard locations appear to be /etc/ca-certificates.conf and /usr/share/ca-certificates. Not sure yet about Fedora/RHEL. I suppose you hope that people will be using formal CA's rather than their own, or at least have a CA certificate issued by a formal CA from which they can issue their own client & server certs. Rich. -- Red Hat UK Ltd. 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 (will change soon)

3 4

Re: [Libvir] Authenticate APIs ?
by Richard W.M. Jones 15 Jan '07

15 Jan '07

[Apologies that this is not threaded with the original post] > Following on from the issue of certificate management, is the issue of > authentication. This hasn't been an issue thus far, because Xen has zero > authentication. I'm not planning to make this same mistake with the QEMU > management daemon though - its going to have a secure data transport and > real authentication from day-1. Thus we need to consider how authentication > is exposed at the libvirt client API layer. > > First off, there are many possible authentication approaches: > > - Username + password > - Username + one time key > - Username + password digest > - Kerberos tickets > - x509 certificates > - ...etc I would definitely avoid over-engineering a solution. I suspect that "large corp" users will understand certificate infrastructures -- they probably already use X.509 client certificates to authenticate desktops -- and will be able to manage those. Everyone else will want to use ssh, the model for that being the way cvs allows you to flexibly hand over authentication problems to an external program through setting the $CVS_RSH environment variable. It's so easy to set up ssh to get passwordless remote logins. If they haven't set that up, and they're using libvirt through a command line tool like virsh then they'll get a prompt from ssh to type a password. ssh also has the advantage that it is very widely installed. The only issue is what command to run on the remote system. A simple command line tool which talks to the daemon over a socket might be one option. nc (netcat), gnutls_cli or stunnel might work too. Rich. -- Red Hat UK Ltd. 64 Baker Street, London, W1U 7DF Mobile: +44 7866 314 421 (will change soon)

2 1

[Libvir] Certificate management APIs ?
by Daniel P. Berrange 15 Jan '07

15 Jan '07

I now have the QEMU backend working with full wire encryption using the TLS protocol, and so ready to start thinking about various authentication related issues. - The client needs to have the certificate of the CA in order to validate the signature on the remote server's certificate (aka, just like web browsers need a set of CA certificates) Currently I just have it loading 'cert.pem' out of the current working directory of the app using libvirt. Obviously this is not a real solution. - The client technically should have a certificate revocation list too. Again I currently load this out of current working dir - The server end can optionally require the client to present a certificate too, as its means of authenticating the client. This obviously requires a way of specifying the client certificate and secret key in libvirt when opening the connection. - The first time it connects to a server, the client validates the server's certificate against the CA certificate, and remote hostname. Web browsers will also typically display the certificate to the user and ask them to allow one-time, allow permanently, or reject it. This would require a way to pass the certificate back to the client app during the virConnectOpen call. The above is all related to x509 certificates. So we basically have 5 types of file we need to store / provide to libvirt when opening a connection: - Certificate Authority's certificate - Certificate Authority's certificate revocation list - Client secret key - Client certificate - Trusted server certificates And some form of callback to let the client app validate the server certificate. As a rough stab at an API my thoughts are: typedef enum { VIR_CERT_CA_CERT, VIR_CERT_CA_CRL, VIR_CERT_CLIENT_KEY, VIR_CERT_CLIENT_CERT, } virConnectCertDataType; /** * dataType: one of the virConnectCertDataType constants * data: base64, PEM encoded certificate/key data */ int virConnectAddCertData(int dataType, const char *data); /** * dataType: one of the virConnectCertDataType constants * dataFile: file containing base64, PEM encoded certificate/key data */ int virConnectAddCertDataFile(int dataType, const char *dataFile); Virt-manager would use the latter API to load in its client certificate, CA certs, etc to libvirt prior to opening a connection to a TLS enabled server. This means libvirt doesn't have to make the policy on where to store its client cert data. On the otherhand, we probably want the files to be in a common location for virsh & virt-manager so both can use the same data. On yet another hand, virt-manager will also likely end up using TLS to connect to VNC, so needs access to the files independant on libvirt / virsh for that. So we should probably have these flexible APIs, but recommend that all apps use a pre-defined directory unless they have a particular need not to, eg $HOME/.libvirt/tls/ | +- ca | | | +- cert.pem | +- ca-crl.pem | +- client | | | +- cert.pem | +- key.pem | +- server | +- trusted.pem /** * hostname: canonical name of remote host providing certiifcate * cert: base64, PEM encoded certificate data * * Invoked to let client application decide whether to accept a * server certificate. The certificate wil already have been * validated against the CA cert, and its expiration date, etc * checked. This callback is intended to allow the end user to * accept/reject the certificate. The trusted flag indicates * whether the server is present in the list of known servers. */ typedef int (*virConnectCertificateValidator)(const char *hostname, const char *cert); int virConnectSetCertificateValidator(virConnectCertificateValidator cb) The applications like virt-manager would probably want to present the certificate details to the user for validation, also optionally maintaining a list of previously trusted server certs. 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 2

[Libvir] Authenticate APIs ?
by Daniel P. Berrange 15 Jan '07

15 Jan '07

Following on from the issue of certificate management, is the issue of authentication. This hasn't been an issue thus far, because Xen has zero authentication. I'm not planning to make this same mistake with the QEMU management daemon though - its going to have a secure data transport and real authentication from day-1. Thus we need to consider how authentication is exposed at the libvirt client API layer. First off, there are many possible authentication approaches: - Username + password - Username + one time key - Username + password digest - Kerberos tickets - x509 certificates - ...etc So of these require prompting the user for data (eg username / password), others will pick up their credentials from known sources (eg, the keberos ticket cache file in /tmp/krbXXX), or have to be provided ahead of time as part of the transport layer securit protocol (eg the x509 certificate file). We don't have to consider the latter case, since that's taken care of by the certificate management API - unless we want to figure out a more unified API, but I'm not sure it would be particularly sane. The interesting case from an API point of view is the first, which requires prompting the user for data. This is pretty much the PAM approach, with the added complication that you're in the middle of a network protocol and you may have several wire messages going back & forth, each time requesting more pieces of info. ie you can't possibly gather the neccessary info ahead of time. So we need some form of callback to collect the neccessary auth data. The network protocol equivalent of PAM is SASL. This actually has a number of different types of callback function yuou can register, depending on what sort of data you're prepared to provide as a client - Challenge / response: - const char *challenge - const char *prompt - const char *defresult, - const char **result, - unsigned *len - Password, username, language - const char **result - unsigned *len - AUthentication realm - const char **availrealms, - const char **result There are a few more auth callback types defined in SASL spec, which I've omitted here for brevity. We could map this onto an API something like this: enum { VIR_CONN_AUTH_PASSWORD, VIR_CONN_AUTH_USERNAME, VIR_CONN_AUTH_LANG, VIR_CONN_AUTH_CHALLENGE, VIR_CONN_AUTH_REALM, } virConnectAuthToken; typedef int (virConnectAuthCBSimple)(const char **result, unsigned *len); typedef int (virConnectAuthCBPrompt)(const char *challenge, const char *prompt, const char *defresult, const char *result, unsigned *len); typedef int (virConnetAuthCBRealm)(const char **availrealms, const char *result); typedef struct { int token; union { virConnectAuthCBSimple simple; virConnectAuthCBPrompt prompt; virConnectAuthCBRealm realm; } cb; } virConnectAuthCallback; int virConnectSetAuthCallbacks(virConnectAuthCallback *cbs, int ncbs); Now, of course not everything is going to be SASL based - Xen may well end up using TLS/SSL + HTTP Basic auth. There's a couple of other HTTP related auth protocols too. They are all basically a subset of SASL provides, so the above API ought to be sufficient to serve their auth needs too. Finally, one could simply say, this is all rather complicated, why don't we just use a simple username+password for everything. While this would be nice from a coding POV, I think we need to be forward looking and ensure we're setup to cope with things like Kerberos single-sign-on. This is why I'm looking at SASL for the QEMU authentication process - if you use libsasl.so you're app doesn't even need to know what auth method it is using - the admin can simple create an appropriate config file for sasl, and bingo you're fully kerberized & single sign-on capable. 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 2

[Libvir] Availability of the Relax-NG schemas for libvirt XML instances
by Daniel Veillard 13 Jan '07

13 Jan '07

As hinted previously in the QEmu thread, I developped a Relax-NG schemas to check the XML instances used to define Domains in libvirt. It's in CVS in the docs directory and also available online at http://libvirt.org/libvirt.rng For those not familiar with Relax-NG there is a nice tutorial and docs at http://relaxng.org/ Libxml2 on which libvirt depends has support for Relax-NG so we could easilly add checking at domain creation time within the library, but I decided to not add this at the moment, at least the schemas need to get more testing itself. The simplest to validate existing XML instances is to use the command line tool of libxml2 named xmllint in the following way: paphio:~/libvirt/tests -> xmllint --noout --relaxng ../docs/libvirt.rng xml2sexprdata/xml2sexpr-disk-drv-blkback.xml xml2sexprdata/xml2sexpr-disk-drv-blkback.xml validates paphio:~/libvirt/tests -> The schemas try to validate content as much as possible, but it's not possible to validate really in a complete fashion, for example to validate an IP address I used the following type: <define name='addrIP'> <data type='string'> <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> </data> </define> which will catch '192.618.0.254' as erroneous but not '192.168.0.264' . There is also a number of cases which are structure related but hard to express cleanly in a schemas for example the fact that we may have an emulator description in the device list but that it's should only be allowed in an hvm kind of configuration. Still despite the limitations I found 2 weirdness: - we allow both <os> and <bootloader> blocks to be present, but I think they are redundant, I remember that Xen will ignore the bootloader informations if the os description is there, shouldn't we ban having both in a domain description ? e.g. tests/sexpr2xmldata/sexpr2xml-curmem.xml in the tree I still allowed this in the schemas but this may be wrong. - I though an interface of type ethernet needed a source description, but the output tests/sexpr2xmldata/sexpr2xml-net-routed.xml seems to miss both the source and target of the interface though the device is present in tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr as (dev 'eth3') this probably indicates our conversion from sexpr to xml is lossy there. currently tests/sexpr2xmldata/sexpr2xml-net-routed.xml is the only example from our regression tests which doesn't pass the schemas testing. In general the schemas is both stricter than libvirt itself (as libvirt will only pick the parts of the XML it recognizes and need) and still allows some invalid constructs, I guess it's nearly impossible to make it a one to one match but I hope this can still be useful both for client tools, regression testings, and as another source of documentation. I still need to update the libvirt documentation, the XML page had some omissions and document the availability of the schemas and find its place when doing a 'make install', Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

2 1

[Libvir] Bug in the virDomainGetInfo() API of libvirt 0.1.9 with Xen 3.0.3
by Philippe Berthault 12 Jan '07

12 Jan '07

The maxMem field of the virDomainInfo structure is given in bytes instead of Kbytes when the domain is 0 (Domain-0). With others domains, the value of maxMem is correct. Exemple with virsh: On a system with 4 GB memory, virsh reports: # virsh dominfo 0 ... Max memory: 4294967292 kB With the same libvirt version 0.1.9 but with an older Xen (not 3.0.3), the maxMem value of Domain-0 is correct.

3 7

[Libvir] Question about libvirt integration into RHEL-5
by Philippe Berthault 11 Jan '07

11 Jan '07

Hello, Currently, the libvirt integrated into RHEL-5 beta release is the pretty old 0.1.8 version. Could you confirm that in the first release candidate RHEL-5 RC1 (planned february, 28), the libvirt will be the 0.1.8 version or another one ? Thanks.

3 8

[Libvir] PATCH 0/2: Support QEMU (+KVM) in libvirt
by Daniel P. Berrange 09 Jan '07

09 Jan '07

The following series of (2) patches adds a QEMU driver to libvirt. The first patch provides a daemon for managing QEMU instances, the second provides a driver letting libvirt manage QEMU via the daemon. Basic architecture ------------------ The reason for the daemon architecture is two fold: - At this time, there is no (practical) way to enumerate QEMU instances, or reliably connect to the monitor console of an existing process. There is also no way to determine the guest configuration associated with a daemon. - It is desirable to be able to manage QEMU instances using either an unprivilegd local client, or a remote client. The daemon can provide connectivity via UNIX domain sockets, or IPv4 / IPv6 and layer in suitable authentication / encryption via TLS and/or SASL protocols. Anthony Ligouri is working on patches for QEMU with the goal of addressing the first point. For example, an extra command line argument will cause QEMU to save a PID file and create a UNIX socket for its monitor at a well-defined path. More functionality in the monitor console will allow the guest configuration to be reverse engineered from a running guest. Even with those patches, however, it will still be desirable to have a daemon to provide more flexible connectivity, and to facilitate implementation libvirt APIs which are host (rather than guest) related. Thus I expect that over time we can simply enhance the daemon to take advantage of newer capabilities in the QEMU monitor, but keep the same basic libvirt driver architecture. Considering some of the other hypervisor technologies out there, in particular User Mode Linux, and lhype, it may well become possible to let this QEMU daemon also provide the management of these guests - allowing re-use of the single driver backend in the libvirt client library itself. XML format ---------- As discussed in the previous mail thread, the XML format for describing guests with the QEMU backend is the same structure as that for Xen guests, with following enhancements: - The 'type' attribute on the top level <domain> tag can take one of the values 'qemu', 'kqemu' or 'kvm' instead of 'xen'. This selects between the different virtualization approaches QEMU can provide. - The '<type>' attribute within the <os> block of the XML (for now) is still expected to the 'hvm' (indicating full virtualization), although I'm trying to think of a better name, since its not technically hardware accelerated unless you're using KVM - The '<type>' attribute within the <os> block of the XML can have two optional 'arch' and 'machine' attributes. The former selects the CPU architecture to be emulated; the latter the specific machine to have QEMU emulate (determine those supported by QEMU using 'qemu -M ?'). - The <kernel>, <initrd>, <cmdline> elements can be used to specify an explicit kernel to boot off[1], otherwise it'll do a boot of the cdrom, harddisk / floppy (based on <boot> element). Well,the kernel bits are parsed at least. I've not got around to using them when building the QEMU argv yet. - The disk devices are configured in same way as Xen HVM guests. eg you have to use hda -> hdd, and/or fda -> fdb. Only hdc can be selected as a cdrom device. - The network configuration is work in progress. QEMU has many ways to setup networking. I use the 'type' attribute to select between the different approachs 'user', 'tap', 'server', 'client', 'mcast' mapping them directly onto QEMU command line arguments. You can specify a MAC address as usual too. I need to implement auto-generation of MAC addresses if omitted. Most of them have extra bits of metadata though which I've not figured out appropriate XML for yet. Thus when building the QEMU argv I currently just hardcode 'user' networking. - The QEMU binary is determined automatically based on the requested CPU architecture, defaulting to i686 if non specified. It is possible to override the default binary using the <emulator> element within the <devices> section. This is different to previously discussed, because recent work by Anthony merging VMI + KVM to give paravirt guests means that the <loader> element is best kept to refer to the VMI ROM (or other ROM like files :-) - this is also closer to Xen semantics anyway. Connectivity ------------ The namespace under which all connection URIs come is 'qemud'. Thereafter there are several options. First, two well-known local hypervisor connections - qemud:///session This is a per-user private hypervisor connection. The libvirt daemon and qemu guest processes just run as whatever UNIX user your client app is running. This lets unprivileged users use the qemu driver without needing any kind admin rights. Obviously you can't use KQEMU or KVM accelerators unless the /dev/ device node is chmod/chown'd to give you access. The communication goes over a UNIX domain socket which is mode 0600 created in the abstract namespace at $HOME/.qemud.d/sock. - qemud:///system This is a system-wide privileged hypervisor connection. There is only one of these on any given machine. The libvirt_qemud daemon would be started ahead of time (by an init script), possibly running as root, or maybe under a dedicated system user account (and the KQEMU/KVM devices chown'd to match). The admin would optionally also make it listen on IPv4/6 addrs to allow remote communication. (see next URI example) The local communication goes over one of two possible UNIX domain sockets Both in the abstract namespace under the directory /var/run. The first socket called 'qemud' is mode 0600, so only privileged apps (ie root) can access it, and gives full control capabilities. The other called 'qemud-ro' is mode 0666 and any clients connecting to it will be restricted to only read-only libvirt operations by the server. - qemud://hostname:port/ This lets you connect to a daemon over IPv4 or IPv6. If omitted the port is 8123 (will probably change it). This lets you connect to a system daemon on a remote host - assuming it was configured to listen on IPv4/6 interfaces. Currently there is zero auth or encryption, but I'm planning to make it mandortory to use the TLS protocol - using the GNU TLS library. This will give encryption, and mutual authentication using either x509 certificates or PGP keys & trustdbs or perhaps both :-) Will probably start off by implementing PGP since I understand it better. So if you wanted to remotely manage a server, you'd copy the server's certificate/public key to the client into a well known location. Similarly you'd generate a keypair for the client & copy its public key to the server. Perhaps I'll allow clients without a key to connect in read-only mode. Need to prototype it first and then write up some ideas. Server architecture ------------------- The server is a fairly simple beast. It is single-threaded using non-blocking I/O and poll() for all operations. It will listen on multiple sockets for incoming connections. The protocol used for client-server comms is a very simple binary message format close to the existing libvirt_proxy. Client sends a message, server receives it, performs appropriate operation & sends a reply to the client. The client (ie libvirt driver) blocks after sending its message until it gets a reply. The server does non-blocking reads from the client buffering until it has a single complete message, then processes it and populates the buffer with a reply and does non-blocking writes to send it back to the client. It won't try to read a further message from the client until its sent the entire reply back. ie, it is a totally synchronous message flow - no batching/pipelining of messages. During the time the server is processes a message it is not dealing with any other I/O, but thus far all the operations are very fast to implement, so this isn't a serious issue, and there ways to deal with it if there are operations which turn out to take a long time. I certainly want to avoid multi-threading in the server at all costs! As well as monitoring the client & client sockets, the poll() event loop in the server also captures stdout & stderr from the QEMU processes. Currently we just dump this to stdout of the daemon, but I expect we can log it somewhere. When we start accessing the QEMU monitor there will be another fd in the event loop - ie the pseduo-TTY (or UNIX socket) on which we talk to the monitor. Inactive guests --------------- Guests created using 'virsh create' (or equiv API) are treated as 'transient' domains - ie their config files are not saved to disk. This is consistent with the behaviour in the Xen backend. Guests created using 'virsh define', however, are saved out to disk in $HOME/.qemud.d for the per-user session daemon. The system-wide daemon should use /etc/qemud.d, but currently its still /root/.qemud.d The config files are simply saved as the libvirt XML blob ensuring no data conversion issues. In any case, QEMU doesn't currently have any config file format we can leverage. The list of inactive guests is loaded at startup of the daemon. New config files are expected to be created via the API - files manually created in the directory after initial startup are not seen. Might like to change this later. XML Examples ------------ This is a guest using plain qemu, with x86_64 architecture and a ISA-only (ie no PCI) machine emulation. I was actually running this on a 32-bit host :-) VNC is configured to run on port 5906. QEMU can't automatically choose a VNC port, so if one isn't specified we assign one based on the domain ID. This should be fixed in QEMU.... <domain type='qemu'> <name>demo1</name> <uuid>4dea23b3-1d52-d8f3-2516-782e98a23fa0</uuid> <memory>131072</memory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='isapc'>hvm</type> </os> <devices> <disk type='file' device='disk'> <source file='/home/berrange/fedora/diskboot.img'/> <target dev='hda'/> </disk> <interface type='user'> <mac address='24:42:53:21:52:45'/> </interface> <graphics type='vnc' port='5906'/> </devices> </domain> A second example, this time using KVM acceleration. Note how I specify a non-default path to QEMU to pick up the KVM build of QEMU. Normally KVM binary will default to /usr/bin/qemu-kvm - this may change depending on how distro packaging of KVM turns out - it may even be merged into regular QEMU binaries. <domain type='kvm'> <name>demo2</name> <uuid>4dea24b3-1d52-d8f3-2516-782e98a23fa0</uuid> <memory>131072</memory> <vcpu>1</vcpu> <os> <type>hvm</type> </os> <devices> <emulator>/home/berrange/usr/kvm-devel/bin/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <source file='/home/berrange/fedora/diskboot.img'/> <target dev='hda'/> </disk> <interface type='user'> <mac address='24:42:53:21:52:45'/> </interface> <graphics type='vnc' port='-1'/> </devices> </domain> Outstanding work ---------------- - TLS support. Need to add TLS encryption & authentication to both the client and server side for IPv4/6 communications. This will obviously add a dependancy on libgnutls.so in libvirt & the daemon. I don't consider this a major problem since every non-trivial network app these days uses TLS. The other possible impl of OpenSSL has GPL-compatability issues, so is not considered. - Change the wire format to use fixed size data types (ie, int8, int16, int32, etc) instead of the size-dependant int/long types. At same time define some rules for the byte ordering. Client must match server ordering ? Server must accept client's desired ordering ? Everyone must use BE regardless of server/client format ? I'm inclined to say client must match server, since it distributes the byte-swapping overhead to all clients and lets the common case of x86->x86 be a no-op. - Add a protocol version message as first option to let use protocol at will later while maintaining compat with older libvirt client libraries. - Improve support for describing the various QEMU network configurations - Finish boot options - boot device order & explicit kernel - Open & use connection to QEMU monitor which will let us implement pause/resume, suspend/restore drivers, and device hotplug / media changes. - Return sensible data for virNodeInfo - will need to have operating system dependant code here - parsing /proc for Linux to determine available RAM & CPU speed. Who knows what for Solaris / BSD ?!? Anyone know of remotely standard ways for doing this. Accurate host memory reporting is the only really critical data item we need. - There is a fair bit of duplicate in various helper functions between the daemon, and various libvirt driver backends. We should probably pull this stuff out into a separate lib/ directoy, build it into a static library and then link that into both libvirt, virsh & the qemud daemon as needed. 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 12

[Libvir] Get info with libvirt from a remote Xen dom0
by Jordi Prats 09 Jan '07

09 Jan '07

Hi, On the function: virConnectPtr virConnectOpenReadOnly (const char * name) name is unused. Is planned any use for it? I'm particullay interested on obtaining information from a remote machine. I'm trying to provide HA between dom0, so this way is a dom0 chashes another dom0 will create every vm from the othe node. Example: dom0.1 have vm01 and vm02 dom0.2 have vm03 and vm04 Then if dom0.1 goes down, dom0.2 will have vm01,vm02,vm03 and vm04 I'm pretending to use libvirt as a abstraction layer to operate this Xen cluster. Thanks, -- ...................................................................... __ / / Jordi Prats Català C E / S / C A Departament de Sistemes /_/ Centre de Supercomputació de Catalunya Gran Capità, 2-4 (Edifici Nexus) · 08034 Barcelona T. 93 205 6464 · F. 93 205 6979 · jprats(a)cesca.es ...................................................................... pgp:0x5D0D1321 ......................................................................

2 1

[Libvir] XML format for QEMU / KVM driver
by Daniel P. Berrange 03 Jan '07

03 Jan '07

Since KVM is the new "shiny thing" in the virtualization world for Linux I figure its time to resurrect & finish the prototype QEMU backend I started developing for libvirt. Thanks to the design of KVM, it ought to be possible to support KVM & QEMU in a single driver with near-zero extra effort to add the bits for KVM support. There's a couple of interesting decisions wrt additions in the XML format describing guests. 1. QEMU can be built with several different CPU accelerators, eg KQEMU, QVM86 or KVM. These are only available if the guest CPU matches the host CPU architecture though. 2. QEMU can emulate many different CPU types. x86, x86_64, mips, sparc, ppc, arm, etc 3. QEMU can emulate many different different 'machine' types, for each CPU type. eg for x86 cpus: $ qemu -M ? Supported machines are: pc Standard PC (default) isapc ISA-only PC Some of these options are activated by specifying a particular command line flag, eg -M for machine type. Others require you to use a different qemu binary, eg 'qemu-system-arm', 'qemu-system-ppc' instead of 'qemu'. QEMU is basically a fully-virt solution, so XML description for the <os> block would be superficically similar to Xen HVM support, in that it will typically try to boot the kernel found in the MBR of the first harddisk (unless you specify an alternate boot device). Unlike Xen HVM support, it can also have an explicit kernel, initrd & arguments specified via command line. The other difference is that Xen has a separater binary for the loader, vs device model - QEMU/KVM does it all in one binary. So, my initial thoughts are: 1. Use the <type> element within the <os> block to describe the CPU accelerator to use, accepting the values 'qemu', 'kvm', 'kqemu' or 'qvm86'. 2. For CPU architecture, there are a couple of choices a) Add an 'arch' attribute to the <type> element to select between x86, ppc, sparc, etc. b) Add an <arch> element within the <os> block to switch between architectures. c) Just use the <loader> element to point to the QEMU binary matching the desired architecture. d) Use the <emulator> element within the <devices> section to point to the QEMU binary matching the desired architecture. e) Option a) and also allow use of <loader> to override the default QEMU binary to use f) Option b) and also allow use of <loader> to override the default QEMU binary to use g) Option a) and also allow use of <emulator> within the <devices> block to override the default QEMU binary to use h) Option b) and also allow use of <emulator> within the <devices> block to override the default QEMU binary to use At this time, i'm leaning towards either option e). This would give examples like * Using PPC with regular non-accelerated QEMU <os> <type arch="ppc">qemu</type> </os> * Using non-accelerated QEMU, and guest architecture matching the host <os> <type>qemu</type> </os> * Using accelerated KVM <os> <type>kvm</type> </os> * Using accelerated KVM, but with an alernate binary <os> <type>kvm</type> <loader>/home/berrange/work/kvm-devel/qemu-kvm</loader> </os> 3. For machine type, again there are a couple of options: a) Add a 'machine' attribute to the <type> element b) Add a <machine> element within the <os> block For this I think we should just follow same scheme that we use to specify architecture. So I'd lean towards a) * Using PPC with a Mac-99 machine: <os> <type arch="ppc" machine="mac99">qemu</type> </os> * Using non-accelerated QEMU, and guest architecture matching the host, and a non-PCI machine: <os> <type machine="isapc">qemu</type> </os> All the other bits of XML like disk/network/console configuration are pretty straightforward, following very similar structure to Xen. So there isn't really much interesting stuff to discuss there. 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 6

[Libvir] Release of libvirt-0.1.10
by Daniel Veillard 20 Dec '06

20 Dec '06

A couple of bug fixes and significant improvements have accumulated since the last release one month ago, so it's time to push a new one. Available from ftp://libvirt.org/libvirt/ * more localizations * bug fixes: - VCPU info breakages on xen 3.0.3 - xenDaemonListDomains buffer overflow (Daniel Berrange) - reference count bug when creating Xen domains (Daniel Berrange). * improvements: - support graphic framebuffer for Xen paravirt (Daniel Berrange) - VNC listen IP range support (Daniel Berrange) - support for default Xen config files and inactive domains of 3.0.4 (Daniel Berrange). Thanks to Dan and everybody who helped by reporting bugs ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] Fix handling of config files with duplicate named guests
by Daniel P. Berrange 19 Dec '06

19 Dec '06

The code for managing config files in /etc/xen assumed that the filename of the config matched the name of the guest defined inside. One might thing this a reasonable assumption, but in the wild I've had reports from users whom have various config files for the same guest, but with different settings. This caused some really wierd behaviour in the current code base. virt-manager display would alternate displaying each config upon refresh! Now, our API requires that there is only one config per name, so we can't expose this to the UI. The attached patch, thus simply detects when we have more than one config with same named guest, and hides the duplicates. The way it does this is to change the way we cache configs. Previously we had a single hash table mapping relative filenames to virConfPtr objects, with the implicit assumption that relative filename == guest name. With the attached patch we now maintain two hash tables. The first maps fully qualified pathnames to virConfPtr objects, the second maps guest names to the first filename found for that name. Thus when querying details for a guest, we first resolve the guest name to its filename, and then lookup the virConfPtr object associated with this filename. This isn't perfect, but its a hell of alot better than current code, so I want to commit it as is and figure out more improvement later. There is no ABI issue here, so we can iterate over impl at will. 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 4

[Libvir] Still can't run a simple python test libvirt !
by Omer Khalid 19 Dec '06

19 Dec '06

Hi, I am still unable to run my simple libvirt test! I checked out the code from libvirt cvs and following the instructions till 'make install'. It all went well. So then I ran my simply python test, as shown here (http://www.libvirt.org/python.html) It keeps on giving me the following error. [root@lcgctb9 libvirt]# python testLibvirt.py Traceback (most recent call last): File "testLibvirt.py", line 1, in ? import virt ImportError: No module named virt I have verified that the library is linked by the following: [root@lcgctb9 libvirt]# pkg-config libvirt --libs -L/usr/local/lib -lvirt -lxenstore [root@lcgctb9 libvirt]# pkg-config --variable=prefix libvirt /usr/local I really appreciate your help! Regards Omer -- --------------------------------------------------------------- CERN – European Organization for Nuclear Research Information Technology Department CH-1211 Geneva 23 Phone: +41 (0) 22 767 7996 Fax: +41 (0) 22 767 4900 E-mail : Omer.Khalid(a)cern.ch Homepage: http://cern.ch/Omer.Khalid

2 4

[Libvir] [PATCH] Inactive domain management for Xen 3.0.4
by Daniel P. Berrange 13 Dec '06

13 Dec '06

So, my previous set of patches for inactive domain management deal with the problem for Xen 3.0.3 or earlier. In 3.0.4 we now have lifecycle management support, which means we no longer need to scan /etc/xen config files if running against a new XenD. We choose between Xend & scanning /etc/xen files based on the condition 'xendConfigVersion >= 3'. The attached patch adds 5 new entry points to xend_internal.c xenDaemonListDefinedDomains xenDaemonNumOfDefinedDomains xenDaemonDomainCreate xenDaemonDomainDefineXML xenDaemonDomainUndefine These let you enumerate inactive domains, define new ones, delete old ones. Secondly, the patch modifies a number of existing methods to work against inactive domains too. Previously they'd unconditionally pass if the domain id was < 0. Now, if xendConfigVersion is >= 3, then they will know that XenD supports inactive domains & thus work for inactive guests too. xenDaemonDomainGetMaxMemory xenDaemonDomainSetMaxMemory xenDaemonDomainSetMemory xenDaemonDomainGetInfo xenDaemonDomainSetVcpus xenDaemonDomainDumpXML The methods for setting mem,max memory & vcpu count all required further bug fixes to Xend which have been sent upstream & hopefully merged soon. Finally, the patch changes the xendConfigVersion to be lookedup just once when initially connecting to XenD. Since we need this version info very frequently now, it was causing too much unnneccessary overload calling it every time. internal.h | 1 xend_internal.c | 270 +++++++++++++++++++++++++++++++++++++++++++++----------- xend_internal.h | 8 + xm_internal.c | 9 - 4 files changed, 227 insertions(+), 61 deletions(-) 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 2

[Libvir] Libvirt Build problems
by Omer Khalid 13 Dec '06

13 Dec '06

Hi, I am trying to build libvirt on SL4 (kernal = 2.6.12.6-xen3_12.1_rhel4.1). I tried both snapshot tar ball and the cvs checked out version. With the tar ball, after running the ./configure script, make file is created. But make file fails and complains the following: libvirt.c:24:16: xs.h: No such file or directory In file included from libvirt.c:28: xen_internal.h:15:26: xen/dom0_ops.h: No such file or directory make[2]: *** [libvirt.lo] Error 1 make[2]: Leaving directory `/root/virtualization/libvirt2/libvirt-0.1.9/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/root/virtualization/libvirt2/libvirt-0.1.9' make: *** [all] Error 2 While with the cvs version, the script ./autogen.sh fails to create a make file. I am running Python 2.3.4 and gcc version 3.4.6 20060404 (Red Hat 3.4.6-3). Any help would be much appreciated. Best Regards Omer -- --------------------------------------------------------------- CERN – European Organization for Nuclear Research Information Technology Department CH-1211 Geneva 23 Phone: +41 (0) 22 767 7996 Fax: +41 (0) 22 767 4900 E-mail : Omer.Khalid(a)cern.ch

2 8

[Libvir] Update XML -> SEXPR conversion for new PVFB syntax
by Daniel P. Berrange 13 Dec '06

13 Dec '06

Previously I sent a patch to handle parsing of the new PVFB syntax. This patch provides the counterpart - generating the new syntax when creating paravirt guests. We only enable the new style syntax if using xendConfigVersion 3 or later (ie, 3.0.4), and only for PV guests. HVM and older PV guests still use old style syntax. In this I also added support for vnclisten & vncpasswd parameters mapped to the 'listen' and 'passwd' attributes on the XML <graphics> tag. 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 3

[Libvir] [PATCH] Support parsing of new SEXPR for PVFB
by Daniel P. Berrange 05 Dec '06

05 Dec '06

The paravirt framebuffer patches for Xen finally got merged into upstream xen-devel. In doing so, however, the syntax of the SEXPR for configuring them changed completely. The existing framebuffer suppoirt in libvirt thus only works with the 3.0.3 tree + PVFB patches. For 3.0.4 we need to work with the new scheme. Fortunately, in 3.0.4 the xend_config_version flag is bumped from 2 -> 3, so we have an easy value to hook off. The attached patch thus adds support for parsing an SEXPR looking like (device (vfb (vncunused 1) (vnclisten 127.0.0.1) (vncpasswd 123456) (type vnc) ) ) And generating the <graphics type='vnc' port='5903'/> XML tag to match. (A later patch will add support for the reverse direction) 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 2

[Libvir] Release of libvirt-0.1.9
by Daniel Veillard 29 Nov '06

29 Nov '06

A lot of improvement and bug fixes have accumulated in the last month, so it was clearly time for a new release: ftp://libvirt.org/libvirt/libvirt-0.1.9.tar.gz * python bindings: release interpeter lock when calling C (Daniel Berrange) * don't raise HTTP error when looking informations for a domain * some refactoring to use the driver for all entry points * better error reporting (Daniel Berrange) * fix OS reporting when running as non-root * provide XML parsing errors * extension of the test framework (Daniel Berrange) * fix the reconnect regression test * python bindings: Domain instances now link to the Connect to avoid garbage collection and disconnect * separate the notion of maximum memory and current use at the XML level * Fix a memory leak (Daniel Berrange) * add support for shareable drives * add support for non-bridge style networking configs for guests(Daniel Berrange) * python bindings: fix unsigned long marshalling (Daniel Berrange) * new config APIs virConfNew() and virConfSetValue() to build configs from scratch * hot plug device support based on Michel Ponceau patch * added support for inactive domains, new APIs, various associated cleanup (Daniel Berrange) * special device model for HVM guests (Daniel Berrange) * add API to dump core of domains (but requires a patched xend) * pygrub bootloader informations take over <os> informations * updated the localization strings thanks to everybody who helped for this new release, with bug reports or patches ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] vif-nat network setup
by Tomas Kouba 23 Nov '06

23 Nov '06

Hello, is it possible to setup a NAT-ed network with libvir? My dom0 is configured so that it does a router for domUs and it also does NAT for domUs. I can set this up manually but now I would like to install some other domUs automatically with virt-install. I see that it uses libvir to create new domain from the XML description so it should be easy to add some option that would configure the XML, but I cannot find if the XML supports NAT setup. If I try 'virsh dumpxml' when the domU runs I get this: Unimplemented block at xend_internal.c:1667 <domain type='xen' id='1'> <name>ce</name> <uuid>400be3cf7cedc1d388de8796a85daff1</uuid> <os> <type>linux</type> <kernel>/boot/vmlinuz-2.6.18-prep</kernel> <initrd>/boot/initrd-2.6.18-prep.img</initrd> <root>/dev/sda1</root> <cmdline>fastboot ro root=/dev/sda1</cmdline> </os> <memory>131072</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices>  <console tty='/dev/pts/2'/> </devices> </domain> Thanks for any answer. -- Tomas Kouba

3 3

[Libvir] virDomainDump() API (equivalent to xm dump) in libvirt?
by Lon Hohberger 22 Nov '06

22 Nov '06

There's already one for saving live domains: int virDomainSave(virDomainPtr domain, const char *to); Why not use a similar API for a function which does the equivalent of 'xm dump' ? int virDomainDump(virDomainPtr domain, const char *to, int flags); Create a kernel dump of the domain in the path contained in *to. This API must fail if the domain is not in a panicked/crashed state. If you set the lowest-bit in flags, however, you can override this behavior: if the lowest bit is set, the domain will first be crashed (similar to SysRq-C) - then a dump will be taken from that. Why? In the event that a cluster node needs to fence a Xen domain (or other management tools, to be sure), we could use the API to generate a core of the domain (if it panicked) to help debug the problem prior to restarting the domain. The 'crash-before-dump' bit is just something someone might want to use at some point; I don't think it is absolutely necessary - but it doesn't hurt anything either. -- Lon

4 12

Re: [Libvir] Patch to attach/detach virtual devices on a running domain
by michel.ponceau＠bull.net 21 Nov '06

21 Nov '06

There is a bug in GetNetworkID(): return(ret) with ret=list[i], after free(list). It leads to process abort on free(xref) in caller XMLDevID(). I corrected this by replacing: ret = list[i]; by: ret = malloc(16); if (ret != NULL) strcpy(ret, list[i]); Our tests were successful afterwards. Daniel Veillard <veillard(a)redhat.com> 20/11/2006 16:50 Veuillez répondre à veillard Pour : michel.ponceau(a)bull.net cc : libvir-list(a)redhat.com Objet : Re: [Libvir] Patch to attach/detach virtual devices on a running domain On Thu, Nov 16, 2006 at 12:19:13PM -0500, Daniel Veillard wrote: > On Tue, Nov 14, 2006 at 10:05:47AM -0500, Daniel Veillard wrote: > > 5/ virDomainXMLDevID does direct acces to xs_directory() and xs_read(), > > that's not proper it should not call xenStore directly that need to > > be cleaned up, define one high level function exported from > > xs_internal.[ch] and call that but no direct access should be done > > that leads to unmaintainable code. > > That still need to be isolated, I added a TODO in src/xml.c to this effect. Okay I have done it, as a new function xenStoreDomainGetNetworkID() from xs_internal.[ch] Could you check out the version from CVS and verify I didn't added any regression ? thanks, Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

2 1

[Libvir] Patch to attach/detach virtual devices on a running domain
by michel.ponceau＠bull.net 20 Nov '06

20 Nov '06

This patch adds to Libvirt-0.1.8 the two functions described in my preceding mail. It has been tested in our Bull environment. Michel Ponceau 02/10/2006 17:27 Pour : libvir-list(a)redhat.com cc : Objet : Proposal for virtual devices described in XML Proposal modified after comments from Daniel P. Berrange: /* Create a virtual device attachment to backend */ int virDomainAttachDevice(virDomainPtr domain, char *xml); /* Destroy a virtual device attachment to backend */ int virDomainDetachDevice(virDomainPtr domain, char *xml); /* @domain: pointer to domain object * @xml: pointer to XML description of one device * Returns 0 in case of success, -1 in case of failure. */ The XML is in same form as the part of domain description for a single device, either <disk.../disk> or <interface.../interface>. In Detach function, the device is identified by its target name for "disk", and its MAC address for "interface". When the MAC address has not been assigned by Libvirt user at device creation, it must be retrieved from Xen using virDomainGetXMLDesc function.

3 4

[Libvir] [PATCH 0/6] Inactive domain support
by Daniel P. Berrange 16 Nov '06

16 Nov '06

The following series of patches is an update of my previous patches for supporting inactive domains in libvirt. A rough highlight of changes since last time: - Can override /etc/xen by setting LIBVIRT_XM_CONFIG_DIR env variable for people who move it to non-standard location - Several memory corruption bugs in config file refresh were solved - Fixed booting with paravirt framebuffer + grub - Added support for new APIs to python binding - Removed logic for supressing 404 errors (already merged earlier) - More complete device handling support (now creates network devices) Previous posting was here: http://www.redhat.com/archives/libvir-list/2006-September/msg00003.html 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 23

[Libvir] Request and proposition about hardware capabilities in virNodeInfo
by Philippe Berthault 16 Nov '06

16 Nov '06

Hello, To administrate virtual machines by using livbvirt, we need to known if the underlying hardware platform supports hvm (Intel-VT or AMD-V) or not. Currently, this information is returned by the "xm info" command of Xen in the "xen_caps" line but there is no equivalent in libvirt. So we propose to add this information in libvirt API. There is three possibilities for doing that: 1) Add one or several fields in the virNodeInfo structure returned by the virNodeGetInfo() function. These fields would be either strings such as strings returned by "xm info" or either bit fields with one bit per hardware capability. 2) Add one or several specific functions returning a boolean value for each hardware capability we want to test. 3) Add a specific function which returns either a bit fields of all the hardware capabilities or a structure such as virNodeInfo but far more complete. The problem with the proposition #1 is that the size of the virNodeInfo structure is changed. This implies for all libvirt users to recompile their programs linked with libvirt to avoid a 'core dump' at the execution. This is the reason why propositions 2 and 3 exist. NB: On an IA32 system, we can check flags in /proc/cpuinfo but on an IA64 platform with Montecito processors, there is no information about hardware capabilities in /proc/cpuinfo and the only way to known if the hardware supports hvm is by using the 'xm info' command. What is your opinion about these propositions ? Regards.

3 3

Re: [Libvir] Patch to attach/detach virtual devices on a running domain
by michel.ponceau＠bull.net 15 Nov '06

15 Nov '06

I cannot see the bug in virParseXMLDevice. The 'error' label sequence is ended by 'goto cleanup', and 'cleanup' sequence calls xmlFreeDoc(xml). Is it not the way to free the xmlDocPtr object 'xml'? Maybe I should reverse the sequence order to be more clear, as follows: + goto cleanup; +error: + free(buf.content); + buf.content = NULL; +cleanup: + if (xml != NULL) + xmlFreeDoc(xml); + return buf.content; "Daniel P. Berrange" <berrange(a)redhat.com> 14/11/2006 19:36 Veuillez répondre à "Daniel P. Berrange" Pour : michel.ponceau(a)bull.net cc : libvir-list(a)redhat.com Objet : Re: [Libvir] Patch to attach/detach virtual devices on a running domain On Tue, Nov 14, 2006 at 03:34:05PM +0100, michel.ponceau(a)bull.net wrote: > This patch adds to Libvirt-0.1.8 the two functions described in my > preceding mail. It has been tested in our Bull environment. This looks good to me - only one small bug I see - in the virParseXMLDevice function there is a memory leak. If you take 'goto errror' path through the function, then the xmlDocPtr object will never be free'd. Thanks for taking the time to implement all this ! 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 -=|

1 0