Merge lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009142019 into lp:ubuntu/maverick/libvirt

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/libvirt now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/libvirt/maverick-201009142019. A merge should be performed if necessary.

=== added directory '.pc/9025-Add-nwfilter-support-to-UML-driver.patch'
=== renamed directory '.pc/9025-Add-nwfilter-support-to-UML-driver.patch' => '.pc/9025-Add-nwfilter-support-to-UML-driver.patch.moved'
=== added file '.pc/9025-Add-nwfilter-support-to-UML-driver.patch/.timestamp'
=== added directory '.pc/9025-Add-nwfilter-support-to-UML-driver.patch/src'
=== added directory '.pc/9025-Add-nwfilter-support-to-UML-driver.patch/src/uml'
=== added file '.pc/9025-Add-nwfilter-support-to-UML-driver.patch/src/uml/uml_conf.c'
--- .pc/9025-Add-nwfilter-support-to-UML-driver.patch/src/uml/uml_conf.c	1970-01-01 00:00:00 +0000
+++ .pc/9025-Add-nwfilter-support-to-UML-driver.patch/src/uml/uml_conf.c	2010-09-14 20:26:05 +0000
@@ -0,0 +1,601 @@
+/*
+ * uml_conf.c: UML driver configuration
+ *
+ * Copyright (C) 2006-2009 Red Hat, Inc.
+ * Copyright (C) 2006 Daniel P. Berrange
+ *
+ * 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
+ *
+ * Author: Daniel P. Berrange <[e-mail]>
+ */
+
+#include <config.h>
+
+#include <dirent.h>
+#include <string.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/wait.h>
+#include <arpa/inet.h>
+#include <sys/utsname.h>
+
+#include "uml_conf.h"
+#include "uuid.h"
+#include "buf.h"
+#include "conf.h"
+#include "util.h"
+#include "memory.h"
+#include "nodeinfo.h"
+#include "verify.h"
+#include "bridge.h"
+#include "logging.h"
+
+#define VIR_FROM_THIS VIR_FROM_UML
+
+#define umlLog(level, msg, ...)                                     \
+        virLogMessage(__FILE__, level, 0, msg, __VA_ARGS__)
+
+virCapsPtr umlCapsInit(void) {
+    struct utsname utsname;
+    virCapsPtr caps;
+    virCapsGuestPtr guest;
+
+    /* Really, this never fails - look at the man-page. */
+    uname (&utsname);
+
+    if ((caps = virCapabilitiesNew(utsname.machine,
+                                   0, 0)) == NULL)
+        goto error;
+
+    /* Some machines have problematic NUMA toplogy causing
+     * unexpected failures. We don't want to break the QEMU
+     * driver in this scenario, so log errors & carry on
+     */
+    if (nodeCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
+
+    if (virGetHostUUID(caps->host.host_uuid)) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR,
+                       "%s", _("cannot get the host uuid"));
+        goto error;
+    }
+
+    if ((guest = virCapabilitiesAddGuest(caps,
+                                         "uml",
+                                         utsname.machine,
+                                         STREQ(utsname.machine, "x86_64") ? 64 : 32,
+                                         NULL,
+                                         NULL,
+                                         0,
+                                         NULL)) == NULL)
+        goto error;
+
+    if (virCapabilitiesAddGuestDomain(guest,
+                                      "uml",
+                                      NULL,
+                                      NULL,
+                                      0,
+                                      NULL) == NULL)
+        goto error;
+
+    caps->defaultConsoleTargetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML;
+
+    return caps;
+
+ error:
+    virCapabilitiesFree(caps);
+    return NULL;
+}
+
+
+static int
+umlConnectTapDevice(virDomainNetDefPtr net,
+                    const char *bridge)
+{
+    brControl *brctl = NULL;
+    int template_ifname = 0;
+    int err;
+    unsigned char tapmac[VIR_MAC_BUFLEN];
+
+    if ((err = brInit(&brctl))) {
+        virReportSystemError(err, "%s",
+                             _("cannot initialize bridge support"));
+        goto error;
+    }
+
+    if (!net->ifname ||
+        STRPREFIX(net->ifname, "vnet") ||
+        strchr(net->ifname, '%')) {
+        VIR_FREE(net->ifname);
+        if (!(net->ifname = strdup("vnet%d")))
+            goto no_memory;
+        /* avoid exposing vnet%d in dumpxml or error outputs */
+        template_ifname = 1;
+    }
+
+    memcpy(tapmac, net->mac, VIR_MAC_BUFLEN);
+    tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */
+    if ((err = brAddTap(brctl,
+                        bridge,
+                        &net->ifname,
+                        tapmac,
+                        0,
+                        NULL))) {
+        if (errno == ENOTSUP) {
+            /* In this particular case, give a better diagnostic. */
+            umlReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Failed to add tap interface to bridge. "
+                             "%s is not a bridge device"), bridge);
+        } else if (template_ifname) {
+            virReportSystemError(err,
+                                 _("Failed to add tap interface to bridge '%s'"),
+                                 bridge);
+        } else {
+            virReportSystemError(err,
+                                 _("Failed to add tap interface '%s' to bridge '%s'"),
+                                 net->ifname, bridge);
+        }
+        if (template_ifname)
+            VIR_FREE(net->ifname);
+        goto error;
+    }
+
+    brShutdown(brctl);
+
+    return 0;
+
+no_memory:
+    virReportOOMError();
+error:
+    brShutdown(brctl);
+    return -1;
+}
+
+static char *
+umlBuildCommandLineNet(virConnectPtr conn,
+                       virDomainNetDefPtr def,
+                       int idx)
+{
+    virBuffer buf = VIR_BUFFER_INITIALIZER;
+
+    /* General format:  ethNN=type,options */
+
+    virBufferVSprintf(&buf, "eth%d=", idx);
+
+    switch (def->type) {
+    case VIR_DOMAIN_NET_TYPE_USER:
+        /* ethNNN=slirp,macaddr */
+        virBufferAddLit(&buf, "slirp");
+        break;
+
+    case VIR_DOMAIN_NET_TYPE_ETHERNET:
+        /* ethNNN=tuntap,tapname,macaddr,gateway */
+        virBufferAddLit(&buf, "tuntap");
+        if (def->data.ethernet.ipaddr) {
+            umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("IP address not supported for ethernet inteface"));
+            goto error;
+        }
+        if (def->data.ethernet.script) {
+            umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("script execution not supported for ethernet inteface"));
+            goto error;
+        }
+        break;
+
+    case VIR_DOMAIN_NET_TYPE_SERVER:
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("TCP server networking type not supported"));
+        goto error;
+
+    case VIR_DOMAIN_NET_TYPE_CLIENT:
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("TCP client networking type not supported"));
+        goto error;
+
+    case VIR_DOMAIN_NET_TYPE_MCAST:
+        /* ethNNN=tuntap,macaddr,ipaddr,port */
+        virBufferAddLit(&buf, "mcast");
+        break;
+
+    case VIR_DOMAIN_NET_TYPE_NETWORK:
+    {
+        char *bridge;
+        virNetworkPtr network = virNetworkLookupByName(conn,
+                                                       def->data.network.name);
+        if (!network) {
+            umlReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Network '%s' not found"),
+                           def->data.network.name);
+            goto error;
+        }
+        bridge = virNetworkGetBridgeName(network);
+        virNetworkFree(network);
+        if (bridge == NULL) {
+            goto error;
+        }
+
+        if (umlConnectTapDevice(def, bridge) < 0) {
+            VIR_FREE(bridge);
+            goto error;
+        }
+
+        /* ethNNN=tuntap,tapname,macaddr,gateway */
+        virBufferVSprintf(&buf, "tuntap,%s", def->ifname);
+        break;
+    }
+
+    case VIR_DOMAIN_NET_TYPE_BRIDGE:
+        if (umlConnectTapDevice(def, def->data.bridge.brname) < 0)
+            goto error;
+
+        /* ethNNN=tuntap,tapname,macaddr,gateway */
+        virBufferVSprintf(&buf, "tuntap,%s", def->ifname);
+        break;
+
+    case VIR_DOMAIN_NET_TYPE_INTERNAL:
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("internal networking type not supported"));
+        goto error;
+
+    case VIR_DOMAIN_NET_TYPE_DIRECT:
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("direct networking type not supported"));
+        goto error;
+
+    case VIR_DOMAIN_NET_TYPE_LAST:
+        break;
+    }
+
+    virBufferVSprintf(&buf, ",%02x:%02x:%02x:%02x:%02x:%02x",
+                      def->mac[0], def->mac[1], def->mac[2],
+                      def->mac[3], def->mac[4], def->mac[5]);
+
+    if (def->type == VIR_DOMAIN_NET_TYPE_MCAST) {
+        virBufferVSprintf(&buf, ",%s,%d",
+                          def->data.socket.address,
+                          def->data.socket.port);
+    }
+
+    if (virBufferError(&buf)) {
+        virReportOOMError();
+        return NULL;
+    }
+
+    return virBufferContentAndReset(&buf);
+
+error:
+    virBufferFreeAndReset(&buf);
+    return NULL;
+}
+
+static char *
+umlBuildCommandLineChr(virDomainChrDefPtr def,
+                       const char *dev,
+                       fd_set *keepfd)
+{
+    char *ret = NULL;
+
+    switch (def->type) {
+    case VIR_DOMAIN_CHR_TYPE_NULL:
+        if (virAsprintf(&ret, "%s%d=null", dev, def->target.port) < 0) {
+            virReportOOMError();
+            return NULL;
+        }
+        break;
+
+    case VIR_DOMAIN_CHR_TYPE_PTY:
+        if (virAsprintf(&ret, "%s%d=pts", dev, def->target.port) < 0) {
+            virReportOOMError();
+            return NULL;
+        }
+        break;
+
+    case VIR_DOMAIN_CHR_TYPE_DEV:
+        if (virAsprintf(&ret, "%s%d=tty:%s", dev, def->target.port,
+                        def->data.file.path) < 0) {
+            virReportOOMError();
+            return NULL;
+        }
+        break;
+
+    case VIR_DOMAIN_CHR_TYPE_STDIO:
+        if (virAsprintf(&ret, "%s%d=fd:0,fd:1", dev, def->target.port) < 0) {
+            virReportOOMError();
+            return NULL;
+        }
+        break;
+
+    case VIR_DOMAIN_CHR_TYPE_TCP:
+        if (def->data.tcp.listen != 1) {
+            umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("only TCP listen is supported for chr device"));
+            return NULL;
+        }
+
+        if (virAsprintf(&ret, "%s%d=port:%s", dev, def->target.port,
+                        def->data.tcp.service) < 0) {
+            virReportOOMError();
+            return NULL;
+        }
+        break;
+
+    case VIR_DOMAIN_CHR_TYPE_FILE:
+         {
+            int fd_out;
+
+            if ((fd_out = open(def->data.file.path,
+                               O_WRONLY | O_APPEND | O_CREAT, 0660)) < 0) {
+                virReportSystemError(errno,
+                                     _("failed to open chardev file: %s"),
+                                     def->data.file.path);
+                return NULL;
+            }
+            if (virAsprintf(&ret, "%s%d=null,fd:%d", dev, def->target.port, fd_out) < 0) {
+                virReportOOMError();
+                close(fd_out);
+                return NULL;
+            }
+            FD_SET(fd_out, keepfd);
+        }
+        break;
+   case VIR_DOMAIN_CHR_TYPE_PIPE:
+        /* XXX could open the pipe & just pass the FDs. Be wary of
+         * the effects of blocking I/O, though. */
+
+    case VIR_DOMAIN_CHR_TYPE_VC:
+    case VIR_DOMAIN_CHR_TYPE_UDP:
+    case VIR_DOMAIN_CHR_TYPE_UNIX:
+    default:
+        umlReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("unsupported chr device type %d"), def->type);
+        break;
+    }
+
+    return ret;
+}
+
+/*
+ * Null-terminate the current argument and return a pointer to the next.
+ * This should follow the same rules as the Linux kernel: arguments are
+ * separated by spaces; arguments can be quoted with double quotes; double
+ * quotes can't be escaped.
+ */
+static char *umlNextArg(char *args)
+{
+    int in_quote = 0;
+
+    for (; *args; args++) {
+        if (*args == ' ' && !in_quote) {
+            *args++ = '\0';
+            break;
+        }
+        if (*args == '"')
+            in_quote = !in_quote;
+    }
+
+    while (*args == ' ')
+        args++;
+
+    return args;
+}
+
+/*
+ * Constructs a argv suitable for launching uml with config defined
+ * for a given virtual machine.
+ */
+int umlBuildCommandLine(virConnectPtr conn,
+                        struct uml_driver *driver,
+                        virDomainObjPtr vm,
+                        fd_set *keepfd,
+                        const char ***retargv,
+                        const char ***retenv)
+{
+    int i, j;
+    char memory[50];
+    struct utsname ut;
+    int qargc = 0, qarga = 0;
+    const char **qargv = NULL;
+    int qenvc = 0, qenva = 0;
+    const char **qenv = NULL;
+    char *cmdline = NULL;
+
+    uname(&ut);
+
+#define ADD_ARG_SPACE                                                   \
+    do {                                                                \
+        if (qargc == qarga) {                                           \
+            qarga += 10;                                                \
+            if (VIR_REALLOC_N(qargv, qarga) < 0)                        \
+                goto no_memory;                                         \
+        }                                                               \
+    } while (0)
+
+#define ADD_ARG(thisarg)                                                \
+    do {                                                                \
+        ADD_ARG_SPACE;                                                  \
+        qargv[qargc++] = thisarg;                                       \
+    } while (0)
+
+#define ADD_ARG_LIT(thisarg)                                            \
+    do {                                                                \
+        ADD_ARG_SPACE;                                                  \
+        if ((qargv[qargc++] = strdup(thisarg)) == NULL)                 \
+            goto no_memory;                                             \
+    } while (0)
+
+#define ADD_ARG_PAIR(key,val)                                           \
+    do {                                                                \
+        char *arg;                                                      \
+        ADD_ARG_SPACE;                                                  \
+        if (virAsprintf(&arg, "%s=%s", key, val) < 0)                   \
+            goto no_memory;                                             \
+        qargv[qargc++] = arg;                                           \
+    } while (0)
+
+
+#define ADD_ENV_SPACE                                                   \
+    do {                                                                \
+        if (qenvc == qenva) {                                           \
+            qenva += 10;                                                \
+            if (VIR_REALLOC_N(qenv, qenva) < 0)                         \
+                goto no_memory;                                         \
+        }                                                               \
+    } while (0)
+
+#define ADD_ENV(thisarg)                                                \
+    do {                                                                \
+        ADD_ENV_SPACE;                                                  \
+        qenv[qenvc++] = thisarg;                                        \
+    } while (0)
+
+#define ADD_ENV_LIT(thisarg)                                            \
+    do {                                                                \
+        ADD_ENV_SPACE;                                                  \
+        if ((qenv[qenvc++] = strdup(thisarg)) == NULL)                  \
+            goto no_memory;                                             \
+    } while (0)
+
+#define ADD_ENV_COPY(envname)                                           \
+    do {                                                                \
+        char *val = getenv(envname);                                    \
+        char *envval;                                                   \
+        ADD_ENV_SPACE;                                                  \
+        if (val != NULL) {                                              \
+            if (virAsprintf(&envval, "%s=%s", envname, val) < 0)        \
+                goto no_memory;                                         \
+            qenv[qenvc++] = envval;                                     \
+        }                                                               \
+    } while (0)
+
+    snprintf(memory, sizeof(memory), "%luK", vm->def->memory);
+
+    ADD_ENV_LIT("LC_ALL=C");
+
+    ADD_ENV_COPY("LD_PRELOAD");
+    ADD_ENV_COPY("LD_LIBRARY_PATH");
+    ADD_ENV_COPY("PATH");
+    ADD_ENV_COPY("USER");
+    ADD_ENV_COPY("LOGNAME");
+    ADD_ENV_COPY("TMPDIR");
+
+    ADD_ARG_LIT(vm->def->os.kernel);
+    //ADD_ARG_PAIR("con0", "fd:0,fd:1");
+    ADD_ARG_PAIR("mem", memory);
+    ADD_ARG_PAIR("umid", vm->def->name);
+    ADD_ARG_PAIR("uml_dir", driver->monitorDir);
+
+    if (vm->def->os.root)
+        ADD_ARG_PAIR("root", vm->def->os.root);
+
+    for (i = 0 ; i < vm->def->ndisks ; i++) {
+        virDomainDiskDefPtr disk = vm->def->disks[i];
+
+        if (!STRPREFIX(disk->dst, "ubd")) {
+            umlReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("unsupported disk type '%s'"), disk->dst);
+            goto error;
+        }
+
+        ADD_ARG_PAIR(disk->dst, disk->src);
+    }
+
+    for (i = 0 ; i < vm->def->nnets ; i++) {
+        char *ret = umlBuildCommandLineNet(conn, vm->def->nets[i], i);
+        if (!ret)
+            goto error;
+        ADD_ARG(ret);
+    }
+
+    for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) {
+        char *ret = NULL;
+        if (i == 0 && vm->def->console)
+            ret = umlBuildCommandLineChr(vm->def->console, "con", keepfd);
+        if (!ret)
+            if (virAsprintf(&ret, "con%d=none", i) < 0)
+                goto no_memory;
+        ADD_ARG(ret);
+    }
+
+    for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) {
+        virDomainChrDefPtr chr = NULL;
+        char *ret = NULL;
+        for (j = 0 ; j < vm->def->nserials ; j++)
+            if (vm->def->serials[j]->target.port == i)
+                chr = vm->def->serials[j];
+        if (chr)
+            ret = umlBuildCommandLineChr(chr, "ssl", keepfd);
+        if (!ret)
+            if (virAsprintf(&ret, "ssl%d=none", i) < 0)
+                goto no_memory;
+        ADD_ARG(ret);
+    }
+
+    if (vm->def->os.cmdline) {
+        char *args, *next_arg;
+        if ((cmdline = strdup(vm->def->os.cmdline)) == NULL)
+            goto no_memory;
+
+        args = cmdline;
+        while (*args == ' ')
+            args++;
+
+        while (*args) {
+            next_arg = umlNextArg(args);
+            ADD_ARG_LIT(args);
+            args = next_arg;
+        }
+    }
+
+    ADD_ARG(NULL);
+    ADD_ENV(NULL);
+
+    *retargv = qargv;
+    *retenv = qenv;
+    return 0;
+
+ no_memory:
+    virReportOOMError();
+ error:
+
+    if (qargv) {
+        for (i = 0 ; i < qargc ; i++)
+            VIR_FREE((qargv)[i]);
+        VIR_FREE(qargv);
+    }
+    if (qenv) {
+        for (i = 0 ; i < qenvc ; i++)
+            VIR_FREE((qenv)[i]);
+        VIR_FREE(qenv);
+    }
+    VIR_FREE(cmdline);
+    return -1;
+
+#undef ADD_ARG
+#undef ADD_ARG_LIT
+#undef ADD_ARG_SPACE
+#undef ADD_USBDISK
+#undef ADD_ENV
+#undef ADD_ENV_COPY
+#undef ADD_ENV_LIT
+#undef ADD_ENV_SPACE
+}
 
=== added file '.pc/9025-Add-nwfilter-support-to-UML-driver.patch/src/uml/uml_driver.c'
--- .pc/9025-Add-nwfilter-support-to-UML-driver.patch/src/uml/uml_driver.c	1970-01-01 00:00:00 +0000
+++ .pc/9025-Add-nwfilter-support-to-UML-driver.patch/src/uml/uml_driver.c	2010-09-14 20:26:05 +0000
@@ -0,0 +1,2205 @@
+/*
+ * uml_driver.c: core driver methods for managing UML guests
+ *
+ * Copyright (C) 2006-2010 Red Hat, Inc.
+ * Copyright (C) 2006-2008 Daniel P. Berrange
+ *
+ * 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
+ *
+ * Author: Daniel P. Berrange <[e-mail]>
+ */
+
+#include <config.h>
+
+#include <sys/types.h>
+#include <sys/poll.h>
+#include <dirent.h>
+#include <limits.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/utsname.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <paths.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <sys/inotify.h>
+#include <sys/un.h>
+
+#include "uml_driver.h"
+#include "uml_conf.h"
+#include "event.h"
+#include "buf.h"
+#include "util.h"
+#include "nodeinfo.h"
+#include "stats_linux.h"
+#include "capabilities.h"
+#include "memory.h"
+#include "uuid.h"
+#include "domain_conf.h"
+#include "datatypes.h"
+#include "logging.h"
+
+#define VIR_FROM_THIS VIR_FROM_UML
+
+/* For storing short-lived temporary files. */
+#define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt"
+
+typedef struct _umlDomainObjPrivate umlDomainObjPrivate;
+typedef umlDomainObjPrivate *umlDomainObjPrivatePtr;
+struct _umlDomainObjPrivate {
+    int monitor;
+    int monitorWatch;
+};
+
+
+static int umlShutdown(void);
+
+static void *umlDomainObjPrivateAlloc(void)
+{
+    umlDomainObjPrivatePtr priv;
+
+    if (VIR_ALLOC(priv) < 0)
+        return NULL;
+
+    priv->monitor = -1;
+    priv->monitorWatch = -1;
+
+    return priv;
+}
+
+static void umlDomainObjPrivateFree(void *data)
+{
+    umlDomainObjPrivatePtr priv = data;
+
+    VIR_FREE(priv);
+}
+
+
+static void umlDriverLock(struct uml_driver *driver)
+{
+    virMutexLock(&driver->lock);
+}
+static void umlDriverUnlock(struct uml_driver *driver)
+{
+    virMutexUnlock(&driver->lock);
+}
+
+
+static int umlOpenMonitor(struct uml_driver *driver,
+                          virDomainObjPtr vm);
+static int umlReadPidFile(struct uml_driver *driver,
+                          virDomainObjPtr vm);
+
+static int umlSetCloseExec(int fd) {
+    int flags;
+    if ((flags = fcntl(fd, F_GETFD)) < 0)
+        goto error;
+    flags |= FD_CLOEXEC;
+    if ((fcntl(fd, F_SETFD, flags)) < 0)
+        goto error;
+    return 0;
+ error:
+    VIR_ERROR0(_("Failed to set close-on-exec file descriptor flag"));
+    return -1;
+}
+
+static int umlStartVMDaemon(virConnectPtr conn,
+                            struct uml_driver *driver,
+                            virDomainObjPtr vm);
+
+static void umlShutdownVMDaemon(virConnectPtr conn,
+                                struct uml_driver *driver,
+                                virDomainObjPtr vm);
+
+
+static int umlMonitorCommand(const struct uml_driver *driver,
+                             const virDomainObjPtr vm,
+                             const char *cmd,
+                             char **reply);
+
+static struct uml_driver *uml_driver = NULL;
+
+struct umlAutostartData {
+    struct uml_driver *driver;
+    virConnectPtr conn;
+};
+
+static void
+umlAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque)
+{
+    virDomainObjPtr vm = payload;
+    const struct umlAutostartData *data = opaque;
+
+    virDomainObjLock(vm);
+    if (vm->autostart &&
+        !virDomainObjIsActive(vm)) {
+        virResetLastError();
+        if (umlStartVMDaemon(data->conn, data->driver, vm) < 0) {
+            virErrorPtr err = virGetLastError();
+            VIR_ERROR(_("Failed to autostart VM '%s': %s"),
+                      vm->def->name, err ? err->message : _("unknown error"));
+        }
+    }
+    virDomainObjUnlock(vm);
+}
+
+static void
+umlAutostartConfigs(struct uml_driver *driver) {
+    /* XXX: Figure out a better way todo this. The domain
+     * startup code needs a connection handle in order
+     * to lookup the bridge associated with a virtual
+     * network
+     */
+    virConnectPtr conn = virConnectOpen(driver->privileged ?
+                                        "uml:///system" :
+                                        "uml:///session");
+    /* Ignoring NULL conn which is mostly harmless here */
+
+    struct umlAutostartData data = { driver, conn };
+
+    virHashForEach(driver->domains.objs, umlAutostartDomain, &data);
+
+    if (conn)
+        virConnectClose(conn);
+}
+
+
+static int
+umlIdentifyOneChrPTY(struct uml_driver *driver,
+                     virDomainObjPtr dom,
+                     virDomainChrDefPtr def,
+                     const char *dev)
+{
+    char *cmd;
+    char *res = NULL;
+    int retries = 0;
+    if (virAsprintf(&cmd, "config %s%d", dev, def->target.port) < 0) {
+        virReportOOMError();
+        return -1;
+    }
+requery:
+    if (umlMonitorCommand(driver, dom, cmd, &res) < 0)
+        return -1;
+
+    if (res && STRPREFIX(res, "pts:")) {
+        VIR_FREE(def->data.file.path);
+        if ((def->data.file.path = strdup(res + 4)) == NULL) {
+            virReportOOMError();
+            VIR_FREE(res);
+            VIR_FREE(cmd);
+            return -1;
+        }
+    } else if (!res || STRPREFIX(res, "pts")) {
+        /* It can take a while to startup, so retry for
+           upto 5 seconds */
+        /* XXX should do this in a better non-blocking
+           way somehow ...perhaps register a timer */
+        if (retries++ < 50) {
+            usleep(1000*10);
+            goto requery;
+        }
+    }
+
+    VIR_FREE(cmd);
+    VIR_FREE(res);
+    return 0;
+}
+
+static int
+umlIdentifyChrPTY(struct uml_driver *driver,
+                  virDomainObjPtr dom)
+{
+    int i;
+
+    if (dom->def->console &&
+        dom->def->console->type == VIR_DOMAIN_CHR_TYPE_PTY)
+        if (umlIdentifyOneChrPTY(driver, dom,
+                                 dom->def->console, "con") < 0)
+            return -1;
+
+    for (i = 0 ; i < dom->def->nserials; i++)
+        if (dom->def->serials[i]->type == VIR_DOMAIN_CHR_TYPE_PTY &&
+            umlIdentifyOneChrPTY(driver, dom,
+                                 dom->def->serials[i], "ssl") < 0)
+            return -1;
+
+    return 0;
+}
+
+static void
+umlInotifyEvent(int watch,
+                int fd,
+                int events ATTRIBUTE_UNUSED,
+                void *data)
+{
+    char buf[1024];
+    struct inotify_event *e;
+    int got;
+    char *tmp, *name;
+    struct uml_driver *driver = data;
+    virDomainObjPtr dom;
+
+    umlDriverLock(driver);
+    if (watch != driver->inotifyWatch)
+        goto cleanup;
+
+reread:
+    got = read(fd, buf, sizeof(buf));
+    if (got == -1) {
+        if (errno == EINTR)
+            goto reread;
+        goto cleanup;
+    }
+
+    tmp = buf;
+    while (got) {
+        if (got < sizeof(struct inotify_event))
+            goto cleanup; /* bad */
+
+        e = (struct inotify_event *)tmp;
+        tmp += sizeof(struct inotify_event);
+        got -= sizeof(struct inotify_event);
+
+        if (got < e->len)
+            goto cleanup;
+
+        tmp += e->len;
+        got -= e->len;
+
+        name = (char *)&(e->name);
+
+        dom = virDomainFindByName(&driver->domains, name);
+
+        if (!dom) {
+            continue;
+        }
+
+        if (e->mask & IN_DELETE) {
+            VIR_DEBUG("Got inotify domain shutdown '%s'", name);
+            if (!virDomainObjIsActive(dom)) {
+                virDomainObjUnlock(dom);
+                continue;
+            }
+
+            umlShutdownVMDaemon(NULL, driver, dom);
+        } else if (e->mask & (IN_CREATE | IN_MODIFY)) {
+            VIR_DEBUG("Got inotify domain startup '%s'", name);
+            if (virDomainObjIsActive(dom)) {
+                virDomainObjUnlock(dom);
+                continue;
+            }
+
+            if (umlReadPidFile(driver, dom) < 0) {
+                virDomainObjUnlock(dom);
+                continue;
+            }
+
+            dom->def->id = driver->nextvmid++;
+            dom->state = VIR_DOMAIN_RUNNING;
+
+            if (umlOpenMonitor(driver, dom) < 0) {
+                VIR_WARN0("Could not open monitor for new domain");
+                umlShutdownVMDaemon(NULL, driver, dom);
+            } else if (umlIdentifyChrPTY(driver, dom) < 0) {
+                VIR_WARN0("Could not identify charater devices for new domain");
+                umlShutdownVMDaemon(NULL, driver, dom);
+            }
+        }
+        virDomainObjUnlock(dom);
+    }
+
+cleanup:
+    umlDriverUnlock(driver);
+}
+
+/**
+ * umlStartup:
+ *
+ * Initialization function for the Uml daemon
+ */
+static int
+umlStartup(int privileged) {
+    uid_t uid = geteuid();
+    char *base = NULL;
+    char driverConf[PATH_MAX];
+    char *userdir = NULL;
+
+    if (VIR_ALLOC(uml_driver) < 0)
+        return -1;
+
+    uml_driver->privileged = privileged;
+
+    if (virMutexInit(&uml_driver->lock) < 0) {
+        VIR_FREE(uml_driver);
+        return -1;
+    }
+    umlDriverLock(uml_driver);
+
+    /* Don't have a dom0 so start from 1 */
+    uml_driver->nextvmid = 1;
+    uml_driver->inotifyWatch = -1;
+
+    if (virDomainObjListInit(&uml_driver->domains) < 0)
+        goto error;
+
+    userdir = virGetUserDirectory(uid);
+    if (!userdir)
+        goto error;
+
+    if (privileged) {
+        if (virAsprintf(&uml_driver->logDir,
+                        "%s/log/libvirt/uml", LOCAL_STATE_DIR) == -1)
+            goto out_of_memory;
+
+        if ((base = strdup (SYSCONF_DIR "/libvirt")) == NULL)
+            goto out_of_memory;
+    } else {
+
+        if (virAsprintf(&uml_driver->logDir,
+                        "%s/.libvirt/uml/log", userdir) == -1)
+            goto out_of_memory;
+
+        if (virAsprintf(&base, "%s/.libvirt", userdir) == -1)
+            goto out_of_memory;
+    }
+
+    if (virAsprintf(&uml_driver->monitorDir,
+                    "%s/.uml", userdir) == -1)
+        goto out_of_memory;
+
+    /* Configuration paths are either ~/.libvirt/uml/... (session) or
+     * /etc/libvirt/uml/... (system).
+     */
+    if (snprintf (driverConf, sizeof(driverConf), "%s/uml.conf", base) == -1)
+        goto out_of_memory;
+    driverConf[sizeof(driverConf)-1] = '\0';
+
+    if (virAsprintf(&uml_driver->configDir, "%s/uml", base) == -1)
+        goto out_of_memory;
+
+    if (virAsprintf(&uml_driver->autostartDir, "%s/uml/autostart", base) == -1)
+        goto out_of_memory;
+
+    VIR_FREE(base);
+
+    if ((uml_driver->caps = umlCapsInit()) == NULL)
+        goto out_of_memory;
+
+    uml_driver->caps->privateDataAllocFunc = umlDomainObjPrivateAlloc;
+    uml_driver->caps->privateDataFreeFunc = umlDomainObjPrivateFree;
+
+    if ((uml_driver->inotifyFD = inotify_init()) < 0) {
+        VIR_ERROR0(_("cannot initialize inotify"));
+        goto error;
+    }
+
+    if (virFileMakePath(uml_driver->monitorDir) != 0) {
+        char ebuf[1024];
+        VIR_ERROR(_("Failed to create monitor directory %s: %s"),
+               uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf));
+        goto error;
+    }
+
+    VIR_INFO("Adding inotify watch on %s", uml_driver->monitorDir);
+    if (inotify_add_watch(uml_driver->inotifyFD,
+                          uml_driver->monitorDir,
+                          IN_CREATE | IN_MODIFY | IN_DELETE) < 0) {
+        goto error;
+    }
+
+    if ((uml_driver->inotifyWatch =
+         virEventAddHandle(uml_driver->inotifyFD, POLLIN,
+                           umlInotifyEvent, uml_driver, NULL)) < 0)
+        goto error;
+
+    if (virDomainLoadAllConfigs(uml_driver->caps,
+                                &uml_driver->domains,
+                                uml_driver->configDir,
+                                uml_driver->autostartDir,
+                                0, NULL, NULL) < 0)
+        goto error;
+
+    umlAutostartConfigs(uml_driver);
+
+    umlDriverUnlock(uml_driver);
+    VIR_FREE(userdir);
+
+    return 0;
+
+out_of_memory:
+    VIR_ERROR0(_("umlStartup: out of memory"));
+
+error:
+    VIR_FREE(userdir);
+    VIR_FREE(base);
+    umlDriverUnlock(uml_driver);
+    umlShutdown();
+    return -1;
+}
+
+/**
+ * umlReload:
+ *
+ * Function to restart the Uml daemon, it will recheck the configuration
+ * files and update its state and the networking
+ */
+static int
+umlReload(void) {
+    if (!uml_driver)
+        return 0;
+
+    umlDriverLock(uml_driver);
+    virDomainLoadAllConfigs(uml_driver->caps,
+                            &uml_driver->domains,
+                            uml_driver->configDir,
+                            uml_driver->autostartDir,
+                            0, NULL, NULL);
+
+    umlAutostartConfigs(uml_driver);
+    umlDriverUnlock(uml_driver);
+
+    return 0;
+}
+
+/**
+ * umlActive:
+ *
+ * Checks if the Uml daemon is active, i.e. has an active domain or
+ * an active network
+ *
+ * Returns 1 if active, 0 otherwise
+ */
+static int
+umlActive(void) {
+    int active = 0;
+
+    if (!uml_driver)
+        return 0;
+
+    umlDriverLock(uml_driver);
+    active = virDomainObjListNumOfDomains(&uml_driver->domains, 1);
+    umlDriverUnlock(uml_driver);
+
+    return active;
+}
+
+static void
+umlShutdownOneVM(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque)
+{
+    virDomainObjPtr dom = payload;
+    struct uml_driver *driver = opaque;
+
+    virDomainObjLock(dom);
+    if (virDomainObjIsActive(dom))
+        umlShutdownVMDaemon(NULL, driver, dom);
+    virDomainObjUnlock(dom);
+}
+
+/**
+ * umlShutdown:
+ *
+ * Shutdown the Uml daemon, it will stop all active domains and networks
+ */
+static int
+umlShutdown(void) {
+    if (!uml_driver)
+        return -1;
+
+    umlDriverLock(uml_driver);
+    if (uml_driver->inotifyWatch != -1)
+        virEventRemoveHandle(uml_driver->inotifyWatch);
+    close(uml_driver->inotifyFD);
+    virCapabilitiesFree(uml_driver->caps);
+
+    /* shutdown active VMs
+     * XXX allow them to stay around & reconnect */
+    virHashForEach(uml_driver->domains.objs, umlShutdownOneVM, uml_driver);
+
+    virDomainObjListDeinit(&uml_driver->domains);
+
+    VIR_FREE(uml_driver->logDir);
+    VIR_FREE(uml_driver->configDir);
+    VIR_FREE(uml_driver->autostartDir);
+    VIR_FREE(uml_driver->monitorDir);
+
+    if (uml_driver->brctl)
+        brShutdown(uml_driver->brctl);
+
+    umlDriverUnlock(uml_driver);
+    virMutexDestroy(&uml_driver->lock);
+    VIR_FREE(uml_driver);
+
+    return 0;
+}
+
+
+static int umlReadPidFile(struct uml_driver *driver,
+                          virDomainObjPtr vm)
+{
+    int rc = -1;
+    FILE *file;
+    char *pidfile = NULL;
+    int retries = 0;
+
+    vm->pid = -1;
+    if (virAsprintf(&pidfile, "%s/%s/pid",
+                    driver->monitorDir, vm->def->name) < 0) {
+        virReportOOMError();
+        return -1;
+    }
+
+reopen:
+    if (!(file = fopen(pidfile, "r"))) {
+        if (errno == ENOENT &&
+            retries++ < 50) {
+            usleep(1000 * 100);
+            goto reopen;
+        }
+        goto cleanup;
+    }
+
+    if (fscanf(file, "%d", &vm->pid) != 1) {
+        errno = EINVAL;
+        fclose(file);
+        goto cleanup;
+    }
+
+    if (fclose(file) < 0)
+        goto cleanup;
+
+    rc = 0;
+
+ cleanup:
+    if (rc != 0)
+        virReportSystemError(errno,
+                             _("failed to read pid: %s"),
+                             pidfile);
+    VIR_FREE(pidfile);
+    return rc;
+}
+
+static int umlMonitorAddress(const struct uml_driver *driver,
+                             virDomainObjPtr vm,
+                             struct sockaddr_un *addr) {
+    char *sockname;
+    int retval = 0;
+
+    if (virAsprintf(&sockname, "%s/%s/mconsole",
+                    driver->monitorDir, vm->def->name) < 0) {
+        virReportOOMError();
+        return -1;
+    }
+
+    memset(addr, 0, sizeof *addr);
+    addr->sun_family = AF_UNIX;
+    if (virStrcpyStatic(addr->sun_path, sockname) == NULL) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unix path %s too long for destination"), sockname);
+        retval = -1;
+    }
+    VIR_FREE(sockname);
+    return retval;
+}
+
+static int umlOpenMonitor(struct uml_driver *driver,
+                          virDomainObjPtr vm) {
+    struct sockaddr_un addr;
+    struct stat sb;
+    int retries = 0;
+    umlDomainObjPrivatePtr priv = vm->privateData;
+
+    if (umlMonitorAddress(driver, vm, &addr) < 0)
+        return -1;
+
+    VIR_DEBUG("Dest address for monitor is '%s'", addr.sun_path);
+restat:
+    if (stat(addr.sun_path, &sb) < 0) {
+        if (errno == ENOENT &&
+            retries++ < 50) {
+            usleep(1000 * 100);
+            goto restat;
+        }
+        return -1;
+    }
+
+    if ((priv->monitor = socket(PF_UNIX, SOCK_DGRAM, 0)) < 0) {
+        virReportSystemError(errno,
+                             "%s", _("cannot open socket"));
+        return -1;
+    }
+
+    memset(addr.sun_path, 0, sizeof addr.sun_path);
+    sprintf(addr.sun_path + 1, "libvirt-uml-%u", vm->pid);
+    VIR_DEBUG("Reply address for monitor is '%s'", addr.sun_path+1);
+    if (bind(priv->monitor, (struct sockaddr *)&addr, sizeof addr) < 0) {
+        virReportSystemError(errno,
+                             "%s", _("cannot bind socket"));
+        close(priv->monitor);
+        priv->monitor = -1;
+        return -1;
+    }
+
+    return 0;
+}
+
+
+#define MONITOR_MAGIC 0xcafebabe
+#define MONITOR_BUFLEN 512
+#define MONITOR_VERSION 2
+
+struct monitor_request {
+    uint32_t magic;
+    uint32_t version;
+    uint32_t length;
+    char data[MONITOR_BUFLEN];
+};
+
+struct monitor_response {
+    uint32_t error;
+    uint32_t extra;
+    uint32_t length;
+    char data[MONITOR_BUFLEN];
+};
+
+
+static int umlMonitorCommand(const struct uml_driver *driver,
+                             const virDomainObjPtr vm,
+                             const char *cmd,
+                             char **reply)
+{
+    struct monitor_request req;
+    struct monitor_response res;
+    char *retdata = NULL;
+    int retlen = 0, ret = 0;
+    struct sockaddr_un addr;
+    unsigned int addrlen;
+    umlDomainObjPrivatePtr priv = vm->privateData;
+
+    VIR_DEBUG("Run command '%s'", cmd);
+
+    *reply = NULL;
+
+    if (umlMonitorAddress(driver, vm, &addr) < 0)
+        return -1;
+
+    memset(&req, 0, sizeof(req));
+    req.magic = MONITOR_MAGIC;
+    req.version = MONITOR_VERSION;
+    req.length = strlen(cmd);
+    if (req.length > (MONITOR_BUFLEN-1)) {
+        virReportSystemError(EINVAL,
+                             _("cannot send too long command %s (%d bytes)"),
+                             cmd, req.length);
+        return -1;
+    }
+    if (virStrcpyStatic(req.data, cmd) == NULL) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Command %s too long for destination"), cmd);
+        return -1;
+    }
+
+    if (sendto(priv->monitor, &req, sizeof req, 0,
+               (struct sockaddr *)&addr, sizeof addr) != (sizeof req)) {
+        virReportSystemError(errno,
+                             _("cannot send command %s"),
+                             cmd);
+        return -1;
+    }
+
+    do {
+        ssize_t nbytes;
+        addrlen = sizeof(addr);
+        nbytes = recvfrom(priv->monitor, &res, sizeof res, 0,
+                          (struct sockaddr *)&addr, &addrlen);
+        if (nbytes < 0) {
+            if (errno == EAGAIN || errno == EINTR)
+                continue;
+            virReportSystemError(errno, _("cannot read reply %s"), cmd);
+            goto error;
+        }
+        /* Ensure res.length is safe to read before validating its value.  */
+        if (nbytes < offsetof(struct monitor_request, data) ||
+            nbytes < offsetof(struct monitor_request, data) + res.length) {
+            virReportSystemError(0, _("incomplete reply %s"), cmd);
+            goto error;
+        }
+
+        if (VIR_REALLOC_N(retdata, retlen + res.length) < 0) {
+            virReportOOMError();
+            goto error;
+        }
+        memcpy(retdata + retlen, res.data, res.length);
+        retlen += res.length - 1;
+        retdata[retlen] = '\0';
+
+        if (res.error)
+            ret = -1;
+
+    } while (res.extra);
+
+    VIR_DEBUG("Command reply is '%s'", NULLSTR(retdata));
+
+    if (ret < 0)
+        VIR_FREE(retdata);
+    else
+        *reply = retdata;
+
+    return ret;
+
+error:
+    VIR_FREE(retdata);
+    return -1;
+}
+
+
+static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED,
+                                virDomainObjPtr vm) {
+    int i;
+    int err;
+    int ret = 0;
+    brControl *brctl = NULL;
+    VIR_ERROR0(_("Cleanup tap"));
+    if (brInit(&brctl) < 0)
+        return -1;
+
+    for (i = 0 ; i < vm->def->nnets ; i++) {
+        virDomainNetDefPtr def = vm->def->nets[i];
+
+        if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE &&
+            def->type != VIR_DOMAIN_NET_TYPE_NETWORK)
+            continue;
+
+        VIR_ERROR(_("Cleanup '%s'"), def->ifname);
+        err = brDeleteTap(brctl, def->ifname);
+        if (err) {
+            VIR_ERROR(_("Cleanup failed %d"), err);
+            ret = -1;
+        }
+    }
+    VIR_ERROR0(_("Cleanup tap done"));
+    brShutdown(brctl);
+    return ret;
+}
+
+static int umlStartVMDaemon(virConnectPtr conn,
+                            struct uml_driver *driver,
+                            virDomainObjPtr vm) {
+    const char **argv = NULL, **tmp;
+    const char **progenv = NULL;
+    int i, ret;
+    pid_t pid;
+    char *logfile;
+    int logfd = -1;
+    struct stat sb;
+    fd_set keepfd;
+    char ebuf[1024];
+    umlDomainObjPrivatePtr priv = vm->privateData;
+
+    FD_ZERO(&keepfd);
+
+    if (virDomainObjIsActive(vm)) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("VM is already active"));
+        return -1;
+    }
+
+    if (!vm->def->os.kernel) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("no kernel specified"));
+        return -1;
+    }
+    /* Make sure the binary we are about to try exec'ing exists.
+     * Technically we could catch the exec() failure, but that's
+     * in a sub-process so its hard to feed back a useful error
+     */
+    if (stat(vm->def->os.kernel, &sb) < 0) {
+        virReportSystemError(errno,
+                             _("Cannot find UML kernel %s"),
+                             vm->def->os.kernel);
+        return -1;
+    }
+
+    if (virFileMakePath(driver->logDir) != 0) {
+        virReportSystemError(errno,
+                             _("cannot create log directory %s"),
+                             driver->logDir);
+        return -1;
+    }
+
+    if (virAsprintf(&logfile, "%s/%s.log",
+                    driver->logDir, vm->def->name) < 0) {
+        virReportOOMError();
+        return -1;
+    }
+
+    if ((logfd = open(logfile, O_CREAT | O_TRUNC | O_WRONLY,
+                      S_IRUSR | S_IWUSR)) < 0) {
+        virReportSystemError(errno,
+                             _("failed to create logfile %s"),
+                             logfile);
+        VIR_FREE(logfile);
+        return -1;
+    }
+    VIR_FREE(logfile);
+
+    if (umlSetCloseExec(logfd) < 0) {
+        virReportSystemError(errno,
+                             "%s", _("Unable to set VM logfile close-on-exec flag"));
+        close(logfd);
+        return -1;
+    }
+
+    if (umlBuildCommandLine(conn, driver, vm, &keepfd,
+                            &argv, &progenv) < 0) {
+        close(logfd);
+        umlCleanupTapDevices(conn, vm);
+        return -1;
+    }
+
+    tmp = progenv;
+    while (*tmp) {
+        if (safewrite(logfd, *tmp, strlen(*tmp)) < 0)
+            VIR_WARN("Unable to write envv to logfile: %s",
+                   virStrerror(errno, ebuf, sizeof ebuf));
+        if (safewrite(logfd, " ", 1) < 0)
+            VIR_WARN("Unable to write envv to logfile: %s",
+                   virStrerror(errno, ebuf, sizeof ebuf));
+        tmp++;
+    }
+    tmp = argv;
+    while (*tmp) {
+        if (safewrite(logfd, *tmp, strlen(*tmp)) < 0)
+            VIR_WARN("Unable to write argv to logfile: %s",
+                   virStrerror(errno, ebuf, sizeof ebuf));
+        if (safewrite(logfd, " ", 1) < 0)
+            VIR_WARN("Unable to write argv to logfile: %s",
+                   virStrerror(errno, ebuf, sizeof ebuf));
+        tmp++;
+    }
+    if (safewrite(logfd, "\n", 1) < 0)
+        VIR_WARN("Unable to write argv to logfile: %s",
+                 virStrerror(errno, ebuf, sizeof ebuf));
+
+    priv->monitor = -1;
+
+    ret = virExecDaemonize(argv, progenv, &keepfd, &pid,
+                           -1, &logfd, &logfd,
+                           VIR_EXEC_CLEAR_CAPS,
+                           NULL, NULL, NULL);
+    close(logfd);
+
+    /*
+     * At the moment, the only thing that populates keepfd is
+     * umlBuildCommandLineChr. We want to close every fd it opens.
+     */
+    for (i = 0; i < FD_SETSIZE; i++)
+        if (FD_ISSET(i, &keepfd))
+            close(i);
+
+    for (i = 0 ; argv[i] ; i++)
+        VIR_FREE(argv[i]);
+    VIR_FREE(argv);
+
+    for (i = 0 ; progenv[i] ; i++)
+        VIR_FREE(progenv[i]);
+    VIR_FREE(progenv);
+
+    if (ret < 0)
+        umlCleanupTapDevices(conn, vm);
+
+    /* NB we don't mark it running here - we do that async
+       with inotify */
+    /* XXX what if someone else tries to start it again
+       before we get the inotification ? Sounds like
+       trouble.... */
+
+    return ret;
+}
+
+static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
+                                struct uml_driver *driver ATTRIBUTE_UNUSED,
+                                virDomainObjPtr vm)
+{
+    int ret;
+    umlDomainObjPrivatePtr priv = vm->privateData;
+
+    if (!virDomainObjIsActive(vm))
+        return;
+
+    virKillProcess(vm->pid, SIGTERM);
+
+    if (priv->monitor != -1)
+        close(priv->monitor);
+    priv->monitor = -1;
+
+    if ((ret = waitpid(vm->pid, NULL, 0)) != vm->pid) {
+        VIR_WARN("Got unexpected pid %d != %d",
+               ret, vm->pid);
+    }
+
+    vm->pid = -1;
+    vm->def->id = -1;
+    vm->state = VIR_DOMAIN_SHUTOFF;
+
+    umlCleanupTapDevices(conn, vm);
+
+    if (vm->newDef) {
+        virDomainDefFree(vm->def);
+        vm->def = vm->newDef;
+        vm->def->id = -1;
+        vm->newDef = NULL;
+    }
+}
+
+
+static virDrvOpenStatus umlOpen(virConnectPtr conn,
+                                virConnectAuthPtr auth ATTRIBUTE_UNUSED,
+                                int flags ATTRIBUTE_UNUSED) {
+    if (conn->uri == NULL) {
+        if (uml_driver == NULL)
+            return VIR_DRV_OPEN_DECLINED;
+
+        conn->uri = xmlParseURI(uml_driver->privileged ?
+                                "uml:///system" :
+                                "uml:///session");
+        if (!conn->uri) {
+            virReportOOMError();
+            return VIR_DRV_OPEN_ERROR;
+        }
+    } else {
+        if (conn->uri->scheme == NULL ||
+            STRNEQ (conn->uri->scheme, "uml"))
+            return VIR_DRV_OPEN_DECLINED;
+
+        /* Allow remote driver to deal with URIs with hostname server */
+        if (conn->uri->server != NULL)
+            return VIR_DRV_OPEN_DECLINED;
+
+
+        /* Check path and tell them correct path if they made a mistake */
+        if (uml_driver->privileged) {
+            if (STRNEQ (conn->uri->path, "/system") &&
+                STRNEQ (conn->uri->path, "/session")) {
+                umlReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("unexpected UML URI path '%s', try uml:///system"),
+                               conn->uri->path);
+                return VIR_DRV_OPEN_ERROR;
+            }
+        } else {
+            if (STRNEQ (conn->uri->path, "/session")) {
+                umlReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("unexpected UML URI path '%s', try uml:///session"),
+                               conn->uri->path);
+                return VIR_DRV_OPEN_ERROR;
+            }
+        }
+
+        /* URI was good, but driver isn't active */
+        if (uml_driver == NULL) {
+            umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("uml state driver is not active"));
+            return VIR_DRV_OPEN_ERROR;
+        }
+    }
+
+    conn->privateData = uml_driver;
+
+    return VIR_DRV_OPEN_SUCCESS;
+}
+
+static int umlClose(virConnectPtr conn) {
+    /*struct uml_driver *driver = conn->privateData;*/
+
+    conn->privateData = NULL;
+
+    return 0;
+}
+
+static const char *umlGetType(virConnectPtr conn ATTRIBUTE_UNUSED) {
+    return "UML";
+}
+
+
+static int umlIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED)
+{
+    /* Trivially secure, since always inside the daemon */
+    return 1;
+}
+
+
+static int umlIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED)
+{
+    /* Not encrypted, but remote driver takes care of that */
+    return 0;
+}
+
+
+static char *umlGetCapabilities(virConnectPtr conn) {
+    struct uml_driver *driver = (struct uml_driver *)conn->privateData;
+    char *xml;
+
+    umlDriverLock(driver);
+    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
+        virReportOOMError();
+    umlDriverUnlock(driver);
+
+    return xml;
+}
+
+
+
+static int umlGetProcessInfo(unsigned long long *cpuTime, int pid) {
+    char proc[PATH_MAX];
+    FILE *pidinfo;
+    unsigned long long usertime, systime;
+
+    if (snprintf(proc, sizeof(proc), "/proc/%d/stat", pid) >= (int)sizeof(proc)) {
+        return -1;
+    }
+
+    if (!(pidinfo = fopen(proc, "r"))) {
+        /*printf("cannot read pid info");*/
+        /* VM probably shut down, so fake 0 */
+        *cpuTime = 0;
+        return 0;
+    }
+
+    if (fscanf(pidinfo, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu", &usertime, &systime) != 2) {
+        umlDebug("not enough arg");
+        fclose(pidinfo);
+        return -1;
+    }
+
+    /* We got jiffies
+     * We want nanoseconds
+     * _SC_CLK_TCK is jiffies per second
+     * So calulate thus....
+     */
+    *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK);
+
+    umlDebug("Got %llu %llu %llu", usertime, systime, *cpuTime);
+
+    fclose(pidinfo);
+
+    return 0;
+}
+
+
+static virDomainPtr umlDomainLookupByID(virConnectPtr conn,
+                                          int id) {
+    struct uml_driver *driver = (struct uml_driver *)conn->privateData;
+    virDomainObjPtr vm;
+    virDomainPtr dom = NULL;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByID(&driver->domains, id);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_NO_DOMAIN, NULL);
+        goto cleanup;
+    }
+
+    dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
+    if (dom) dom->id = vm->def->id;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return dom;
+}
+
+static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn,
+                                            const unsigned char *uuid) {
+    struct uml_driver *driver = (struct uml_driver *)conn->privateData;
+    virDomainObjPtr vm;
+    virDomainPtr dom = NULL;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, uuid);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_NO_DOMAIN, NULL);
+        goto cleanup;
+    }
+
+    dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
+    if (dom) dom->id = vm->def->id;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return dom;
+}
+
+static virDomainPtr umlDomainLookupByName(virConnectPtr conn,
+                                            const char *name) {
+    struct uml_driver *driver = (struct uml_driver *)conn->privateData;
+    virDomainObjPtr vm;
+    virDomainPtr dom = NULL;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByName(&driver->domains, name);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_NO_DOMAIN, NULL);
+        goto cleanup;
+    }
+
+    dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
+    if (dom) dom->id = vm->def->id;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return dom;
+}
+
+
+static int umlDomainIsActive(virDomainPtr dom)
+{
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr obj;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    obj = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+    if (!obj) {
+        umlReportError(VIR_ERR_NO_DOMAIN, NULL);
+        goto cleanup;
+    }
+    ret = virDomainObjIsActive(obj);
+
+cleanup:
+    if (obj)
+        virDomainObjUnlock(obj);
+    return ret;
+}
+
+
+static int umlDomainIsPersistent(virDomainPtr dom)
+{
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr obj;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    obj = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+    if (!obj) {
+        umlReportError(VIR_ERR_NO_DOMAIN, NULL);
+        goto cleanup;
+    }
+    ret = obj->persistent;
+
+cleanup:
+    if (obj)
+        virDomainObjUnlock(obj);
+    return ret;
+}
+
+
+static int umlGetVersion(virConnectPtr conn, unsigned long *version) {
+    struct uml_driver *driver = conn->privateData;
+    struct utsname ut;
+    int ret = -1;
+
+    umlDriverLock(driver);
+
+    if (driver->umlVersion == 0) {
+        uname(&ut);
+
+        if (virParseVersionString(ut.release, &driver->umlVersion) < 0) {
+            umlReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("cannot parse version %s"), ut.release);
+            goto cleanup;
+        }
+    }
+
+    *version = driver->umlVersion;
+    ret = 0;
+
+cleanup:
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+static int umlListDomains(virConnectPtr conn, int *ids, int nids) {
+    struct uml_driver *driver = conn->privateData;
+    int n;
+
+    umlDriverLock(driver);
+    n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids);
+    umlDriverUnlock(driver);
+
+    return n;
+}
+static int umlNumDomains(virConnectPtr conn) {
+    struct uml_driver *driver = conn->privateData;
+    int n;
+
+    umlDriverLock(driver);
+    n = virDomainObjListNumOfDomains(&driver->domains, 1);
+    umlDriverUnlock(driver);
+
+    return n;
+}
+static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml,
+                                      unsigned int flags) {
+    struct uml_driver *driver = conn->privateData;
+    virDomainDefPtr def;
+    virDomainObjPtr vm = NULL;
+    virDomainPtr dom = NULL;
+
+    virCheckFlags(0, NULL);
+
+    umlDriverLock(driver);
+    if (!(def = virDomainDefParseString(driver->caps, xml,
+                                        VIR_DOMAIN_XML_INACTIVE)))
+        goto cleanup;
+
+    if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0)
+        goto cleanup;
+
+    if (!(vm = virDomainAssignDef(driver->caps,
+                                  &driver->domains,
+                                  def, false)))
+        goto cleanup;
+    def = NULL;
+
+    if (umlStartVMDaemon(conn, driver, vm) < 0) {
+        virDomainRemoveInactive(&driver->domains,
+                                vm);
+        vm = NULL;
+        goto cleanup;
+    }
+
+    dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
+    if (dom) dom->id = vm->def->id;
+
+cleanup:
+    virDomainDefFree(def);
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return dom;
+}
+
+
+static int umlDomainShutdown(virDomainPtr dom) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    char *info = NULL;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByID(&driver->domains, dom->id);
+    umlDriverUnlock(driver);
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN,
+                       _("no domain with matching id %d"), dom->id);
+        goto cleanup;
+    }
+
+#if 0
+    if (umlMonitorCommand(driver, vm, "system_powerdown", &info) < 0) {
+        umlReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                       _("shutdown operation failed"));
+        goto cleanup;
+    }
+    ret = 0;
+#endif
+
+cleanup:
+    VIR_FREE(info);
+    if (vm)
+        virDomainObjUnlock(vm);
+    return ret;
+}
+
+
+static int umlDomainDestroy(virDomainPtr dom) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByID(&driver->domains, dom->id);
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN,
+                       _("no domain with matching id %d"), dom->id);
+        goto cleanup;
+    }
+
+    umlShutdownVMDaemon(dom->conn, driver, vm);
+    if (!vm->persistent) {
+        virDomainRemoveInactive(&driver->domains,
+                                vm);
+        vm = NULL;
+    }
+    ret = 0;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+
+static char *umlDomainGetOSType(virDomainPtr dom) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    char *type = NULL;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    if (!(type = strdup(vm->def->os.type)))
+        virReportOOMError();
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return type;
+}
+
+/* Returns max memory in kb, 0 if error */
+static unsigned long umlDomainGetMaxMemory(virDomainPtr dom) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    unsigned long ret = 0;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
+        umlReportError(VIR_ERR_INVALID_DOMAIN,
+                       _("no domain with matching uuid '%s'"), uuidstr);
+        goto cleanup;
+    }
+    ret = vm->def->maxmem;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return ret;
+}
+
+static int umlDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
+        umlReportError(VIR_ERR_INVALID_DOMAIN,
+                       _("no domain with matching uuid '%s'"), uuidstr);
+        goto cleanup;
+    }
+
+    if (newmax < vm->def->memory) {
+        umlReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("cannot set max memory lower than current memory"));
+        goto cleanup;
+    }
+
+    vm->def->maxmem = newmax;
+    ret = 0;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return ret;
+}
+
+static int umlDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
+        umlReportError(VIR_ERR_INVALID_DOMAIN,
+                       _("no domain with matching uuid '%s'"), uuidstr);
+        goto cleanup;
+    }
+
+    if (virDomainObjIsActive(vm)) {
+        umlReportError(VIR_ERR_NO_SUPPORT, "%s",
+                       _("cannot set memory of an active domain"));
+        goto cleanup;
+    }
+
+    if (newmem > vm->def->maxmem) {
+        umlReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("cannot set memory higher than max memory"));
+        goto cleanup;
+    }
+
+    vm->def->memory = newmem;
+    ret = 0;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return ret;
+}
+
+static int umlDomainGetInfo(virDomainPtr dom,
+                              virDomainInfoPtr info) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    info->state = vm->state;
+
+    if (!virDomainObjIsActive(vm)) {
+        info->cpuTime = 0;
+    } else {
+        if (umlGetProcessInfo(&(info->cpuTime), vm->pid) < 0) {
+            umlReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                           _("cannot read cputime for domain"));
+            goto cleanup;
+        }
+    }
+
+    info->maxMem = vm->def->maxmem;
+    info->memory = vm->def->memory;
+    info->nrVirtCpu = vm->def->vcpus;
+    ret = 0;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return ret;
+}
+
+
+static char *umlDomainDumpXML(virDomainPtr dom,
+                                int flags ATTRIBUTE_UNUSED) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    char *ret = NULL;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    ret = virDomainDefFormat((flags & VIR_DOMAIN_XML_INACTIVE) && vm->newDef ?
+                             vm->newDef : vm->def,
+                             flags);
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    return ret;
+}
+
+
+static int umlListDefinedDomains(virConnectPtr conn,
+                            char **const names, int nnames) {
+    struct uml_driver *driver = conn->privateData;
+    int n;
+
+    umlDriverLock(driver);
+    n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames);
+    umlDriverUnlock(driver);
+
+    return n;
+}
+
+static int umlNumDefinedDomains(virConnectPtr conn) {
+    struct uml_driver *driver = conn->privateData;
+    int n;
+
+    umlDriverLock(driver);
+    n = virDomainObjListNumOfDomains(&driver->domains, 0);
+    umlDriverUnlock(driver);
+
+    return n;
+}
+
+
+static int umlDomainStartWithFlags(virDomainPtr dom, unsigned int flags) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    virCheckFlags(0, -1);
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    ret = umlStartVMDaemon(dom->conn, driver, vm);
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+static int umlDomainStart(virDomainPtr dom) {
+    return umlDomainStartWithFlags(dom, 0);
+}
+
+static virDomainPtr umlDomainDefine(virConnectPtr conn, const char *xml) {
+    struct uml_driver *driver = conn->privateData;
+    virDomainDefPtr def;
+    virDomainObjPtr vm = NULL;
+    virDomainPtr dom = NULL;
+
+    umlDriverLock(driver);
+    if (!(def = virDomainDefParseString(driver->caps, xml,
+                                        VIR_DOMAIN_XML_INACTIVE)))
+        goto cleanup;
+
+    if (virDomainObjIsDuplicate(&driver->domains, def, 0) < 0)
+        goto cleanup;
+
+    if (!(vm = virDomainAssignDef(driver->caps,
+                                  &driver->domains,
+                                  def, false)))
+        goto cleanup;
+    def = NULL;
+    vm->persistent = 1;
+
+    if (virDomainSaveConfig(driver->configDir,
+                            vm->newDef ? vm->newDef : vm->def) < 0) {
+        virDomainRemoveInactive(&driver->domains,
+                                vm);
+        vm = NULL;
+        goto cleanup;
+    }
+
+    dom = virGetDomain(conn, vm->def->name, vm->def->uuid);
+    if (dom) dom->id = vm->def->id;
+
+cleanup:
+    virDomainDefFree(def);
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return dom;
+}
+
+static int umlDomainUndefine(virDomainPtr dom) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    if (virDomainObjIsActive(vm)) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("cannot delete active domain"));
+        goto cleanup;
+    }
+
+    if (!vm->persistent) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("cannot undefine transient domain"));
+        goto cleanup;
+    }
+
+    if (virDomainDeleteConfig(driver->configDir, driver->autostartDir, vm) < 0)
+        goto cleanup;
+
+    virDomainRemoveInactive(&driver->domains,
+                            vm);
+    vm = NULL;
+    ret = 0;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+
+static int umlDomainAttachUmlDisk(struct uml_driver *driver,
+                                  virDomainObjPtr vm,
+                                  virDomainDiskDefPtr disk)
+{
+    int i;
+    char *cmd = NULL;
+    char *reply = NULL;
+
+    for (i = 0 ; i < vm->def->ndisks ; i++) {
+        if (STREQ(vm->def->disks[i]->dst, disk->dst)) {
+            umlReportError(VIR_ERR_OPERATION_FAILED,
+                           _("target %s already exists"), disk->dst);
+            return -1;
+        }
+    }
+
+    if (!disk->src) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR,
+                       "%s", _("disk source path is missing"));
+        goto error;
+    }
+
+    if (virAsprintf(&cmd, "config %s=%s", disk->dst, disk->src) < 0) {
+        virReportOOMError();
+        return -1;
+    }
+
+    if (umlMonitorCommand(driver, vm, cmd, &reply) < 0)
+        goto error;
+
+    if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0) {
+        virReportOOMError();
+        goto error;
+    }
+
+    virDomainDiskInsertPreAlloced(vm->def, disk);
+
+    VIR_FREE(reply);
+    VIR_FREE(cmd);
+
+    return 0;
+
+error:
+
+    VIR_FREE(reply);
+    VIR_FREE(cmd);
+
+    return -1;
+}
+
+
+static int umlDomainAttachDevice(virDomainPtr dom, const char *xml)
+{
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    virDomainDeviceDefPtr dev = NULL;
+    int ret = -1;
+
+    umlDriverLock(driver);
+
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+        virUUIDFormat(dom->uuid, uuidstr);
+        umlReportError(VIR_ERR_NO_DOMAIN,
+                       _("no domain with matching uuid '%s'"), uuidstr);
+        goto cleanup;
+    }
+
+    if (!virDomainObjIsActive(vm)) {
+        umlReportError(VIR_ERR_OPERATION_INVALID,
+                       "%s", _("cannot attach device on inactive domain"));
+        goto cleanup;
+    }
+
+    dev = virDomainDeviceDefParse(driver->caps, vm->def, xml,
+                                  VIR_DOMAIN_XML_INACTIVE);
+
+    if (dev == NULL)
+        goto cleanup;
+
+    if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
+        if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_UML) {
+            ret = umlDomainAttachUmlDisk(driver, vm, dev->data.disk);
+            if (ret == 0)
+                dev->data.disk = NULL;
+        } else {
+            umlReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("disk bus '%s' cannot be hotplugged."),
+                           virDomainDiskBusTypeToString(dev->data.disk->bus));
+        }
+    } else {
+        umlReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("device type '%s' cannot be attached"),
+                       virDomainDeviceTypeToString(dev->type));
+        goto cleanup;
+    }
+
+cleanup:
+
+    virDomainDeviceDefFree(dev);
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+
+static int umlDomainAttachDeviceFlags(virDomainPtr dom,
+                                      const char *xml,
+                                      unsigned int flags) {
+    if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
+        umlReportError(VIR_ERR_OPERATION_INVALID,
+                       "%s", _("cannot modify the persistent configuration of a domain"));
+        return -1;
+    }
+
+    return umlDomainAttachDevice(dom, xml);
+}
+
+
+static int umlDomainDetachUmlDisk(struct uml_driver *driver,
+                                  virDomainObjPtr vm,
+                                  virDomainDeviceDefPtr dev)
+{
+    int i, ret = -1;
+    virDomainDiskDefPtr detach = NULL;
+    char *cmd;
+    char *reply;
+
+    for (i = 0 ; i < vm->def->ndisks ; i++) {
+        if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
+            break;
+        }
+    }
+
+    if (i == vm->def->ndisks) {
+        umlReportError(VIR_ERR_OPERATION_FAILED,
+                       _("disk %s not found"), dev->data.disk->dst);
+        return -1;
+    }
+
+    detach = vm->def->disks[i];
+
+    if (virAsprintf(&cmd, "remove %s", detach->dst) < 0) {
+        virReportOOMError();
+        return -1;
+    }
+
+    if (umlMonitorCommand(driver, vm, cmd, &reply) < 0)
+        goto cleanup;
+
+    virDomainDiskRemove(vm->def, i);
+
+    virDomainDiskDefFree(detach);
+
+    ret = 0;
+
+    VIR_FREE(reply);
+
+cleanup:
+    VIR_FREE(cmd);
+
+    return ret;
+}
+
+
+static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    virDomainDeviceDefPtr dev = NULL;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+        virUUIDFormat(dom->uuid, uuidstr);
+        umlReportError(VIR_ERR_NO_DOMAIN,
+                       _("no domain with matching uuid '%s'"), uuidstr);
+        goto cleanup;
+    }
+
+    if (!virDomainObjIsActive(vm)) {
+        umlReportError(VIR_ERR_OPERATION_INVALID,
+                       "%s", _("cannot detach device on inactive domain"));
+        goto cleanup;
+    }
+
+    dev = virDomainDeviceDefParse(driver->caps, vm->def, xml,
+                                  VIR_DOMAIN_XML_INACTIVE);
+    if (dev == NULL)
+        goto cleanup;
+
+    if (dev->type == VIR_DOMAIN_DEVICE_DISK &&
+        dev->data.disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
+        if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_UML)
+            ret = umlDomainDetachUmlDisk(driver, vm, dev);
+        else {
+            umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("This type of disk cannot be hot unplugged"));
+        }
+    } else {
+        umlReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       "%s", _("This type of device cannot be hot unplugged"));
+    }
+
+cleanup:
+    virDomainDeviceDefFree(dev);
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+
+static int umlDomainDetachDeviceFlags(virDomainPtr dom,
+                                      const char *xml,
+                                      unsigned int flags) {
+    if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
+        umlReportError(VIR_ERR_OPERATION_INVALID,
+                       "%s", _("cannot modify the persistent configuration of a domain"));
+        return -1;
+    }
+
+    return umlDomainDetachDevice(dom, xml);
+}
+
+
+static int umlDomainGetAutostart(virDomainPtr dom,
+                            int *autostart) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    *autostart = vm->autostart;
+    ret = 0;
+
+cleanup:
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+static int umlDomainSetAutostart(virDomainPtr dom,
+                                   int autostart) {
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    char *configFile = NULL, *autostartLink = NULL;
+    int ret = -1;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    if (!vm->persistent) {
+        umlReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("cannot set autostart for transient domain"));
+        goto cleanup;
+    }
+
+    autostart = (autostart != 0);
+
+    if (vm->autostart != autostart) {
+        if ((configFile = virDomainConfigFile(driver->configDir, vm->def->name)) == NULL)
+            goto cleanup;
+        if ((autostartLink = virDomainConfigFile(driver->autostartDir, vm->def->name)) == NULL)
+            goto cleanup;
+
+        if (autostart) {
+            int err;
+
+            if ((err = virFileMakePath(driver->autostartDir))) {
+                virReportSystemError(err,
+                                     _("cannot create autostart directory %s"),
+                                     driver->autostartDir);
+                goto cleanup;
+            }
+
+            if (symlink(configFile, autostartLink) < 0) {
+                virReportSystemError(errno,
+                                     _("Failed to create symlink '%s to '%s'"),
+                                     autostartLink, configFile);
+                goto cleanup;
+            }
+        } else {
+            if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) {
+                virReportSystemError(errno,
+                                     _("Failed to delete symlink '%s'"),
+                                     autostartLink);
+                goto cleanup;
+            }
+        }
+
+        vm->autostart = autostart;
+    }
+    ret = 0;
+
+cleanup:
+    VIR_FREE(configFile);
+    VIR_FREE(autostartLink);
+    if (vm)
+        virDomainObjUnlock(vm);
+    umlDriverUnlock(driver);
+    return ret;
+}
+
+
+static int
+umlDomainBlockPeek (virDomainPtr dom,
+                      const char *path,
+                      unsigned long long offset, size_t size,
+                      void *buffer,
+                      unsigned int flags ATTRIBUTE_UNUSED)
+{
+    struct uml_driver *driver = dom->conn->privateData;
+    virDomainObjPtr vm;
+    int fd = -1, ret = -1, i;
+
+    umlDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    umlDriverUnlock(driver);
+
+    if (!vm) {
+        umlReportError(VIR_ERR_INVALID_DOMAIN, "%s",
+                       _("no domain with matching uuid"));
+        goto cleanup;
+    }
+
+    if (!path || path[0] == '\0') {
+        umlReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("NULL or empty path"));
+        goto cleanup;
+    }
+
+    /* Check the path belongs to this domain. */
+    for (i = 0 ; i < vm->def->ndisks ; i++) {
+        if (vm->def->disks[i]->src != NULL &&
+            STREQ (vm->def->disks[i]->src, path)) {
+            ret = 0;
+            break;
+        }
+    }
+
+    if (ret == 0) {
+        ret = -1;
+        /* The path is correct, now try to open it and get its size. */
+        fd = open (path, O_RDONLY);
+        if (fd == -1) {
+            virReportSystemError(errno,
+                                 _("cannot open %s"), path);
+            goto cleanup;
+        }
+
+        /* Seek and read. */
+        /* NB. Because we configure with AC_SYS_LARGEFILE, off_t should
+         * be 64 bits on all platforms.
+         */
+        if (lseek (fd, offset, SEEK_SET) == (off_t) -1 ||
+            saferead (fd, buffer, size) == (ssize_t) -1) {
+            virReportSystemError(errno,
+                                 _("cannot read %s"), path);
+            goto cleanup;
+        }
+
+        ret = 0;
+    } else {
+        umlReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("invalid path"));
+    }
+
+cleanup:
+    if (fd >= 0) close (fd);
+    if (vm)
+        virDomainObjUnlock(vm);
+    return ret;
+}
+
+
+
+static virDriver umlDriver = {
+    VIR_DRV_UML,
+    "UML",
+    umlOpen, /* open */
+    umlClose, /* close */
+    NULL, /* supports_feature */
+    umlGetType, /* type */
+    umlGetVersion, /* version */
+    NULL, /* libvirtVersion (impl. in libvirt.c) */
+    virGetHostname, /* getHostname */
+    NULL, /* getMaxVcpus */
+    nodeGetInfo, /* nodeGetInfo */
+    umlGetCapabilities, /* getCapabilities */
+    umlListDomains, /* listDomains */
+    umlNumDomains, /* numOfDomains */
+    umlDomainCreate, /* domainCreateXML */
+    umlDomainLookupByID, /* domainLookupByID */
+    umlDomainLookupByUUID, /* domainLookupByUUID */
+    umlDomainLookupByName, /* domainLookupByName */
+    NULL, /* domainSuspend */
+    NULL, /* domainResume */
+    umlDomainShutdown, /* domainShutdown */
+    NULL, /* domainReboot */
+    umlDomainDestroy, /* domainDestroy */
+    umlDomainGetOSType, /* domainGetOSType */
+    umlDomainGetMaxMemory, /* domainGetMaxMemory */
+    umlDomainSetMaxMemory, /* domainSetMaxMemory */
+    umlDomainSetMemory, /* domainSetMemory */
+    umlDomainGetInfo, /* domainGetInfo */
+    NULL, /* domainSave */
+    NULL, /* domainRestore */
+    NULL, /* domainCoreDump */
+    NULL, /* domainSetVcpus */
+    NULL, /* domainPinVcpu */
+    NULL, /* domainGetVcpus */
+    NULL, /* domainGetMaxVcpus */
+    NULL, /* domainGetSecurityLabel */
+    NULL, /* nodeGetSecurityModel */
+    umlDomainDumpXML, /* domainDumpXML */
+    NULL, /* domainXMLFromNative */
+    NULL, /* domainXMLToNative */
+    umlListDefinedDomains, /* listDefinedDomains */
+    umlNumDefinedDomains, /* numOfDefinedDomains */
+    umlDomainStart, /* domainCreate */
+    umlDomainStartWithFlags, /* domainCreateWithFlags */
+    umlDomainDefine, /* domainDefineXML */
+    umlDomainUndefine, /* domainUndefine */
+    umlDomainAttachDevice, /* domainAttachDevice */
+    umlDomainAttachDeviceFlags, /* domainAttachDeviceFlags */
+    umlDomainDetachDevice, /* domainDetachDevice */
+    umlDomainDetachDeviceFlags, /* domainDetachDeviceFlags */
+    NULL, /* domainUpdateDeviceFlags */
+    umlDomainGetAutostart, /* domainGetAutostart */
+    umlDomainSetAutostart, /* domainSetAutostart */
+    NULL, /* domainGetSchedulerType */
+    NULL, /* domainGetSchedulerParameters */
+    NULL, /* domainSetSchedulerParameters */
+    NULL, /* domainMigratePrepare */
+    NULL, /* domainMigratePerform */
+    NULL, /* domainMigrateFinish */
+    NULL, /* domainBlockStats */
+    NULL, /* domainInterfaceStats */
+    NULL, /* domainMemoryStats */
+    umlDomainBlockPeek, /* domainBlockPeek */
+    NULL, /* domainMemoryPeek */
+    NULL, /* domainGetBlockInfo */
+    nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
+    nodeGetFreeMemory,  /* getFreeMemory */
+    NULL, /* domainEventRegister */
+    NULL, /* domainEventDeregister */
+    NULL, /* domainMigratePrepare2 */
+    NULL, /* domainMigrateFinish2 */
+    NULL, /* nodeDeviceDettach */
+    NULL, /* nodeDeviceReAttach */
+    NULL, /* nodeDeviceReset */
+    NULL, /* domainMigratePrepareTunnel */
+    umlIsEncrypted, /* isEncrypted */
+    umlIsSecure, /* isSecure */
+    umlDomainIsActive, /* domainIsActive */
+    umlDomainIsPersistent, /* domainIsPersistent */
+    NULL, /* cpuCompare */
+    NULL, /* cpuBaseline */
+    NULL, /* domainGetJobInfo */
+    NULL, /* domainAbortJob */
+    NULL, /* domainMigrateSetMaxDowntime */
+    NULL, /* domainEventRegisterAny */
+    NULL, /* domainEventDeregisterAny */
+    NULL, /* domainManagedSave */
+    NULL, /* domainHasManagedSaveImage */
+    NULL, /* domainManagedSaveRemove */
+    NULL, /* domainSnapshotCreateXML */
+    NULL, /* domainSnapshotDumpXML */
+    NULL, /* domainSnapshotNum */
+    NULL, /* domainSnapshotListNames */
+    NULL, /* domainSnapshotLookupByName */
+    NULL, /* domainHasCurrentSnapshot */
+    NULL, /* domainSnapshotCurrent */
+    NULL, /* domainRevertToSnapshot */
+    NULL, /* domainSnapshotDelete */
+    NULL, /* qemuDomainMonitorCommand */
+};
+
+
+static virStateDriver umlStateDriver = {
+    .name = "UML",
+    .initialize = umlStartup,
+    .cleanup = umlShutdown,
+    .reload = umlReload,
+    .active = umlActive,
+};
+
+int umlRegister(void) {
+    virRegisterDriver(&umlDriver);
+    virRegisterStateDriver(&umlStateDriver);
+    return 0;
+}
 
=== added file 'debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch'
--- debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch	2010-09-14 20:26:05 +0000
@@ -0,0 +1,58 @@
+From bff2985daf724580866b941c88c820894111cc72 Mon Sep 17 00:00:00 2001
+From: Soren Hansen <[e-mail]>
+Date: Wed, 25 Aug 2010 10:41:14 +0200
+Subject: [PATCH] Explicitly pass uml_dir argument to user-mode-linux
+
+uml_dir overrides user-mode-linux's default of ~/.uml. This is needed
+for a couple of different reasons:
+
+libvirt expects this to default to virGetUserDirectory(geteuid()) +
+'/.uml'. However, user-mode-linux actually uses the HOME environment
+variable to determine where to look for the uml sockets, but if running
+libvirtd under sudo (which I routinely do during development), $HOME is
+pointing at my user's homedir, while my euid is 0, so libvirt looks in
+/root.
+
+Also (and this was my actual motivation for this patch), if HOME isn't
+set at all, user-mode-linux utterly fails. Looking at the code, it seems
+it's meant to emit a warning, but alas, it doesn't for some reason.
+If running libvirtd from upstart, HOME is not set, so any system using
+upstart will need this change.
+
+Signed-off-by: Soren Hansen <[e-mail]>
+---
+ src/uml/uml_conf.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
+index 65b06c5..4906192 100644
+--- a/src/uml/uml_conf.c
++++ b/src/uml/uml_conf.c
+@@ -409,7 +409,7 @@ static char *umlNextArg(char *args)
+  * for a given virtual machine.
+  */
+ int umlBuildCommandLine(virConnectPtr conn,
+-                        struct uml_driver *driver ATTRIBUTE_UNUSED,
++                        struct uml_driver *driver,
+                         virDomainObjPtr vm,
+                         fd_set *keepfd,
+                         const char ***retargv,
+@@ -499,7 +499,6 @@ int umlBuildCommandLine(virConnectPtr conn,
+     ADD_ENV_COPY("LD_PRELOAD");
+     ADD_ENV_COPY("LD_LIBRARY_PATH");
+     ADD_ENV_COPY("PATH");
+-    ADD_ENV_COPY("HOME");
+     ADD_ENV_COPY("USER");
+     ADD_ENV_COPY("LOGNAME");
+     ADD_ENV_COPY("TMPDIR");
+@@ -508,6 +507,7 @@ int umlBuildCommandLine(virConnectPtr conn,
+     //ADD_ARG_PAIR("con0", "fd:0,fd:1");
+     ADD_ARG_PAIR("mem", memory);
+     ADD_ARG_PAIR("umid", vm->def->name);
++    ADD_ARG_PAIR("uml_dir", driver->monitorDir);
+ 
+     if (vm->def->os.root)
+         ADD_ARG_PAIR("root", vm->def->os.root);
+-- 
+1.7.0.4
+
 
=== removed file 'debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch'
--- debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch	2010-08-31 16:05:24 +0000
+++ debian/patches/9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-From bff2985daf724580866b941c88c820894111cc72 Mon Sep 17 00:00:00 2001
-From: Soren Hansen <[e-mail]>
-Date: Wed, 25 Aug 2010 10:41:14 +0200
-Subject: [PATCH] Explicitly pass uml_dir argument to user-mode-linux
-
-uml_dir overrides user-mode-linux's default of ~/.uml. This is needed
-for a couple of different reasons:
-
-libvirt expects this to default to virGetUserDirectory(geteuid()) +
-'/.uml'. However, user-mode-linux actually uses the HOME environment
-variable to determine where to look for the uml sockets, but if running
-libvirtd under sudo (which I routinely do during development), $HOME is
-pointing at my user's homedir, while my euid is 0, so libvirt looks in
-/root.
-
-Also (and this was my actual motivation for this patch), if HOME isn't
-set at all, user-mode-linux utterly fails. Looking at the code, it seems
-it's meant to emit a warning, but alas, it doesn't for some reason.
-If running libvirtd from upstart, HOME is not set, so any system using
-upstart will need this change.
-
-Signed-off-by: Soren Hansen <[e-mail]>
----
- src/uml/uml_conf.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
-index 65b06c5..4906192 100644
---- a/src/uml/uml_conf.c
-+++ b/src/uml/uml_conf.c
-@@ -409,7 +409,7 @@ static char *umlNextArg(char *args)
-  * for a given virtual machine.
-  */
- int umlBuildCommandLine(virConnectPtr conn,
--                        struct uml_driver *driver ATTRIBUTE_UNUSED,
-+                        struct uml_driver *driver,
-                         virDomainObjPtr vm,
-                         fd_set *keepfd,
-                         const char ***retargv,
-@@ -499,7 +499,6 @@ int umlBuildCommandLine(virConnectPtr conn,
-     ADD_ENV_COPY("LD_PRELOAD");
-     ADD_ENV_COPY("LD_LIBRARY_PATH");
-     ADD_ENV_COPY("PATH");
--    ADD_ENV_COPY("HOME");
-     ADD_ENV_COPY("USER");
-     ADD_ENV_COPY("LOGNAME");
-     ADD_ENV_COPY("TMPDIR");
-@@ -508,6 +507,7 @@ int umlBuildCommandLine(virConnectPtr conn,
-     //ADD_ARG_PAIR("con0", "fd:0,fd:1");
-     ADD_ARG_PAIR("mem", memory);
-     ADD_ARG_PAIR("umid", vm->def->name);
-+    ADD_ARG_PAIR("uml_dir", driver->monitorDir);
- 
-     if (vm->def->os.root)
-         ADD_ARG_PAIR("root", vm->def->os.root);
--- 
-1.7.0.4
-
 
=== added file 'debian/patches/9025-Add-nwfilter-support-to-UML-driver.patch'
--- debian/patches/9025-Add-nwfilter-support-to-UML-driver.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/9025-Add-nwfilter-support-to-UML-driver.patch	2010-09-14 20:26:05 +0000
@@ -0,0 +1,112 @@
+From cdd91f237d8f36e2916a55f01a189fabf826fc26 Mon Sep 17 00:00:00 2001
+From: Soren Hansen <[e-mail]>
+Date: Mon, 6 Sep 2010 15:32:30 +0200
+Subject: [PATCH] Add nwfilter support to UML driver
+
+Extend user-mode-linux driver to support nwfilter.
+
+Signed-off-by: Soren Hansen <[e-mail]>
+---
+ src/uml/uml_conf.c   |   16 +++++++++++++---
+ src/uml/uml_driver.c |    8 +++++++-
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
+index 4906192..f2eaef5 100644
+--- a/src/uml/uml_conf.c
++++ b/src/uml/uml_conf.c
+@@ -46,6 +46,7 @@
+ #include "verify.h"
+ #include "bridge.h"
+ #include "logging.h"
++#include "domain_nwfilter.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_UML
+ 
+@@ -108,7 +109,8 @@ virCapsPtr umlCapsInit(void) {
+ 
+ 
+ static int
+-umlConnectTapDevice(virDomainNetDefPtr net,
++umlConnectTapDevice(virConnectPtr conn,
++                    virDomainNetDefPtr net,
+                     const char *bridge)
+ {
+     brControl *brctl = NULL;
+@@ -164,6 +166,14 @@ umlConnectTapDevice(virDomainNetDefPtr net,
+         goto error;
+     }
+ 
++    if (net->filter) {
++        if (virDomainConfNWFilterInstantiate(conn, net)) {
++            if (template_ifname)
++                VIR_FREE(net->ifname);
++            goto error;
++        }
++    }
++
+     brShutdown(brctl);
+ 
+     return 0;
+@@ -239,7 +249,7 @@ umlBuildCommandLineNet(virConnectPtr conn,
+             goto error;
+         }
+ 
+-        if (umlConnectTapDevice(def, bridge) < 0) {
++        if (umlConnectTapDevice(conn, def, bridge) < 0) {
+             VIR_FREE(bridge);
+             goto error;
+         }
+@@ -250,7 +260,7 @@ umlBuildCommandLineNet(virConnectPtr conn,
+     }
+ 
+     case VIR_DOMAIN_NET_TYPE_BRIDGE:
+-        if (umlConnectTapDevice(def, def->data.bridge.brname) < 0)
++        if (umlConnectTapDevice(conn, def, def->data.bridge.brname) < 0)
+             goto error;
+ 
+         /* ethNNN=tuntap,tapname,macaddr,gateway */
+diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
+index 0a5c829..40345d5 100644
+--- a/src/uml/uml_driver.c
++++ b/src/uml/uml_driver.c
+@@ -58,6 +58,7 @@
+ #include "domain_conf.h"
+ #include "datatypes.h"
+ #include "logging.h"
++#include "domain_nwfilter.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_UML
+ 
+@@ -876,6 +877,7 @@ static int umlStartVMDaemon(virConnectPtr conn,
+     if (umlBuildCommandLine(conn, driver, vm, &keepfd,
+                             &argv, &progenv) < 0) {
+         close(logfd);
++        virDomainConfVMNWFilterTeardown(vm);
+         umlCleanupTapDevices(conn, vm);
+         return -1;
+     }
+@@ -928,8 +930,11 @@ static int umlStartVMDaemon(virConnectPtr conn,
+         VIR_FREE(progenv[i]);
+     VIR_FREE(progenv);
+ 
+-    if (ret < 0)
++    if (ret < 0) {
++        virDomainConfVMNWFilterTeardown(vm);
+         umlCleanupTapDevices(conn, vm);
++    }
++
+ 
+     /* NB we don't mark it running here - we do that async
+        with inotify */
+@@ -965,6 +970,7 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
+     vm->def->id = -1;
+     vm->state = VIR_DOMAIN_SHUTOFF;
+ 
++    virDomainConfVMNWFilterTeardown(vm);
+     umlCleanupTapDevices(conn, vm);
+ 
+     if (vm->newDef) {
+-- 
+1.7.1
+
 
=== renamed file 'debian/patches/9025-Add-nwfilter-support-to-UML-driver.patch' => 'debian/patches/9025-Add-nwfilter-support-to-UML-driver.patch.moved'