Update of libvirt with the new upstream release, Daniel

.cvsignore

@@ -1,13 +1,19 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.gz
-libvirt-0.6.0.tar.gz
-libvirt-0.6.1.tar.gz
-libvirt-0.6.2.tar.gz
-libvirt-0.6.3.tar.gz
-libvirt-0.6.4.tar.gz
-libvirt-0.6.5.tar.gz
-libvirt-0.7.0.tar.gz
-libvirt-0.7.1.tar.gz
+libvirt-0.0.3.tar.gz
+libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
+libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz
+libvirt-0.1.5.tar.gz
+libvirt-0.1.6.tar.gz
+libvirt-0.1.7.tar.gz
+libvirt-0.1.8.tar.gz
+libvirt-0.1.9.tar.gz
+libvirt-0.1.10.tar.gz
+libvirt-0.1.11.tar.gz
+libvirt-0.2.0.tar.gz
+libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz

Makefile

@@ -3,19 +3,4 @@
 NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
+include ../common/Makefile.common

branch

@@ -0,0 +1 @@
+F-7

libvirt-0.2.2-bridge-init.patch

@@ -0,0 +1,17 @@
+diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
+--- libvirt-0.2.2/qemud/conf.c	2007-05-14 10:38:52.000000000 -0400
++++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:38:34.000000000 -0400
+@@ -1151,6 +1151,12 @@ qemudNetworkIfaceConnect(struct qemud_se
+         goto error;
+     }
+ 
++    if (!server->brctl && (err = brInit(&server->brctl))) {
++        qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
++                         "cannot initialize bridge support: %s", strerror(err));
++        goto error;
++    }
++
+     if ((err = brAddTap(server->brctl, brname,
+                         ifname, BR_IFNAME_MAXLEN, &tapfd))) {
+         qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
+Only in libvirt-0.2.2.new/qemud: conf.c.orig

libvirt-0.2.2-disable-xm.patch

@@ -0,0 +1,15 @@
+diff -rup libvirt-0.2.2/src/xen_unified.c libvirt-0.2.2.new/src/xen_unified.c
+--- libvirt-0.2.2/src/xen_unified.c	2007-04-17 04:38:52.000000000 -0400
++++ libvirt-0.2.2.new/src/xen_unified.c	2007-05-01 16:49:54.000000000 -0400
+@@ -112,6 +112,11 @@ xenUnifiedOpen (virConnectPtr conn, cons
+     for (i = 0; i < nb_drivers; ++i) {
+         int failed_to_open = 1;
+ 
++        /* Only use XM driver for Xen <= 3.0.3 (ie xendConfigVersion <= 2) */
++        if (drivers[i] == &xenXMDriver &&
++            priv->xendConfigVersion > 2)
++            continue;
++
+         /* Ignore proxy for root */
+         if (i == proxy_offset && getuid() == 0)
+             continue;

libvirt-0.2.2-dnsmasq-order.patch

@@ -0,0 +1,23 @@
+diff -rup libvirt-0.2.2/qemud/qemud.c libvirt-0.2.2.new/qemud/qemud.c
+--- libvirt-0.2.2/qemud/qemud.c	2007-04-11 10:13:36.000000000 -0400
++++ libvirt-0.2.2.new/qemud/qemud.c	2007-05-01 16:51:15.000000000 -0400
+@@ -1110,6 +1110,7 @@ qemudBuildDnsmasqArgv(struct qemud_serve
+     len =
+         1 + /* dnsmasq */
+         1 + /* --keep-in-foreground */
++        1 + /* --strict-order */
+         1 + /* --bind-interfaces */
+         2 + /* --pid-file "" */
+         2 + /* --conf-file "" */
+@@ -1133,6 +1134,11 @@ qemudBuildDnsmasqArgv(struct qemud_serve
+     APPEND_ARG(*argv, i++, "dnsmasq");
+ 
+     APPEND_ARG(*argv, i++, "--keep-in-foreground");
++    /*
++     * Needed to ensure dnsmasq uses same algorithm for processing
++     * multiple nameserver entries in /etc/resolv.conf as GLibC.
++     */
++    APPEND_ARG(*argv, i++, "--strict-order");
+     APPEND_ARG(*argv, i++, "--bind-interfaces");
+ 
+     APPEND_ARG(*argv, i++, "--pid-file");

libvirt-0.2.2-graphics-hvm.patch

@@ -0,0 +1,70 @@
+diff -rup libvirt-0.2.2.new/src/xend_internal.c libvirt-0.2.2/src/xend_internal.c
+--- libvirt-0.2.2.new/src/xend_internal.c	2007-04-15 16:09:10.000000000 -0400
++++ libvirt-0.2.2/src/xend_internal.c	2007-05-03 14:52:42.000000000 -0400
+@@ -1676,35 +1676,38 @@ xend_parse_sexp_desc(virConnectPtr conn,
+         }
+     }
+ 
+-    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.4) vnc config */
+-    tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
+-    if (tmp != NULL) {
+-        if (tmp[0] == '1') {
+-            int port = xenStoreDomainGetVNCPort(conn, domid);
+-            const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
+-            const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
+-            /* For Xen >= 3.0.3, don't generate a fixed port mapping
+-             * because it will almost certainly be wrong ! Just leave
+-             * it as -1 which lets caller see that the VNC server isn't
+-             * present yet. Subsquent dumps of the XML will eventually
+-             * find the port in XenStore once VNC server has started
+-             */
+-            if (port == -1 && xendConfigVersion < 2)
+-                port = 5900 + domid;
+-            virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
+-            if (listenAddr)
+-                virBufferVSprintf(&buf, " listen='%s'", listenAddr);
+-            if (keymap)
+-                virBufferVSprintf(&buf, " keymap='%s'", keymap);
+-            virBufferAdd(&buf, "/>\n", 3);
++    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
++    if ((hvm && xendConfigVersion < 4) ||
++        (!hvm && xendConfigVersion < 3)) {
++        tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
++        if (tmp != NULL) {
++            if (tmp[0] == '1') {
++                int port = xenStoreDomainGetVNCPort(conn, domid);
++                const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
++                const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
++                /* For Xen >= 3.0.3, don't generate a fixed port mapping
++                 * because it will almost certainly be wrong ! Just leave
++                 * it as -1 which lets caller see that the VNC server isn't
++                 * present yet. Subsquent dumps of the XML will eventually
++                 * find the port in XenStore once VNC server has started
++                 */
++                if (port == -1 && xendConfigVersion < 2)
++                    port = 5900 + domid;
++                virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
++                if (listenAddr)
++                    virBufferVSprintf(&buf, " listen='%s'", listenAddr);
++                if (keymap)
++                    virBufferVSprintf(&buf, " keymap='%s'", keymap);
++                virBufferAdd(&buf, "/>\n", 3);
++            }
+         }
+-    }
+ 
+-    /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
+-    tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
+-    if (tmp != NULL) {
+-        if (tmp[0] == '1')
+-            virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
++        /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
++        tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
++        if (tmp != NULL) {
++            if (tmp[0] == '1')
++                virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
++        }
+     }
+ 
+     tty = xenStoreDomainGetConsolePath(conn, domid);
+Only in libvirt-0.2.2/src: xend_internal.c.orig

libvirt-0.2.2-qemu-noreboot.patch

@@ -0,0 +1,128 @@
+diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
+--- libvirt-0.2.2/qemud/conf.c	2007-04-17 04:34:42.000000000 -0400
++++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:36:12.000000000 -0400
+@@ -245,21 +245,25 @@ static int qemudExtractVersionInfo(const
+     cleanup1:
+         _exit(-1); /* Just in case */
+     } else { /* Parent */
+-        char help[4096]; /* Ought to be enough to hold QEMU help screen */
+-        int got, ret = -1;
++        char help[8192]; /* Ought to be enough to hold QEMU help screen */
++        int got = 0, ret = -1;
+         int major, minor, micro;
+ 
+         if (close(newstdout[1]) < 0)
+             goto cleanup2;
+ 
+-    reread:
+-        if ((got = read(newstdout[0], help, sizeof(help)-1)) < 0) {
+-            if (errno == EINTR)
+-                goto reread;
+-            goto cleanup2;
++        while (got < (sizeof(help)-1)) {
++            int len;
++            if ((len = read(newstdout[0], help+got, sizeof(help)-got-1)) <= 0) {
++                if (!len)
++                    break;
++                if (errno == EINTR)
++                    continue;
++                goto cleanup2;
++            }
++            got += len;
+         }
+         help[got] = '\0';
+-
+         if (sscanf(help, "QEMU PC emulator version %d.%d.%d", &major,&minor, &micro) != 3) {
+             goto cleanup2;
+         }
+@@ -267,6 +271,8 @@ static int qemudExtractVersionInfo(const
+         *version = (major * 1000 * 1000) + (minor * 1000) + micro;
+         if (strstr(help, "-no-kqemu"))
+             *flags |= QEMUD_CMD_FLAG_KQEMU;
++        if (strstr(help, "-no-reboot"))
++            *flags |= QEMUD_CMD_FLAG_NO_REBOOT;
+         if (*version >= 9000)
+             *flags |= QEMUD_CMD_FLAG_VNC_COLON;
+         ret = 0;
+@@ -858,6 +864,22 @@ static struct qemud_vm_def *qemudParseXM
+     }
+     xmlXPathFreeObject(obj);
+ 
++
++    /* See if we disable reboots */
++    obj = xmlXPathEval(BAD_CAST "string(/domain/on_reboot)", ctxt);
++    if ((obj == NULL) || (obj->type != XPATH_STRING) ||
++        (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
++        def->noReboot = 0;
++    } else {
++        if (!strcmp((char*)obj->stringval, "destroy"))
++            def->noReboot = 1;
++        else
++            def->noReboot = 0;
++    }
++    if (obj)
++        xmlXPathFreeObject(obj);
++
++
+     /* Extract OS type info */
+     obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1])", ctxt);
+     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
+@@ -1220,6 +1242,8 @@ int qemudBuildCommandLine(struct qemud_s
+         2 + /* cpus */
+         2 + /* boot device */
+         2 + /* monitor */
++        (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
++         vm->def->noReboot ? 1 : 0) + /* no-reboot */
+         (vm->def->features & QEMUD_FEATURE_ACPI ? 0 : 1) + /* acpi */
+         (vm->def->os.kernel[0] ? 2 : 0) + /* kernel */
+         (vm->def->os.initrd[0] ? 2 : 0) + /* initrd */
+@@ -1255,6 +1279,11 @@ int qemudBuildCommandLine(struct qemud_s
+         goto no_memory;
+     if (!((*argv)[++n] = strdup("pty")))
+         goto no_memory;
++    if (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
++        vm->def->noReboot) {
++        if (!((*argv)[++n] = strdup("-no-reboot")))
++            goto no_memory;
++    }
+ 
+     if (!(vm->def->features & QEMUD_FEATURE_ACPI)) {
+         if (!((*argv)[++n] = strdup("-no-acpi")))
+@@ -2517,6 +2546,17 @@ char *qemudGenerateXML(struct qemud_serv
+             goto no_memory;
+     }
+ 
++    if (bufferAdd(buf, "  <on_poweroff>destroy</on_poweroff>\n", -1) < 0)
++        goto no_memory;
++    if (def->noReboot) {
++        if (bufferAdd(buf, "  <on_reboot>destroy</on_reboot>\n", -1) < 0)
++            goto no_memory;
++    } else {
++        if (bufferAdd(buf, "  <on_reboot>restart</on_reboot>\n", -1) < 0)
++            goto no_memory;
++    }
++    if (bufferAdd(buf, "  <on_crash>destroy</on_crash>\n", -1) < 0)
++        goto no_memory;
+ 
+     if (bufferAdd(buf, "  <devices>\n", -1) < 0)
+         goto no_memory;
+diff -rup libvirt-0.2.2/qemud/internal.h libvirt-0.2.2.new/qemud/internal.h
+--- libvirt-0.2.2/qemud/internal.h	2007-04-11 10:13:36.000000000 -0400
++++ libvirt-0.2.2.new/qemud/internal.h	2007-05-14 10:36:02.000000000 -0400
+@@ -161,6 +161,7 @@ enum qemud_vm_grapics_type {
+ enum qemud_cmd_flags {
+     QEMUD_CMD_FLAG_KQEMU = 1,
+     QEMUD_CMD_FLAG_VNC_COLON = 2,
++    QEMUD_CMD_FLAG_NO_REBOOT = 4,
+ };
+ 
+ 
+@@ -191,6 +192,8 @@ struct qemud_vm_def {
+     int maxmem;
+     int vcpus;
+ 
++    int noReboot;
++
+     struct qemud_vm_os_def os;
+ 
+     int features;

libvirt-0.2.2-sync-daemon-restart.patch

@@ -0,0 +1,19 @@
+--- libvirt-0.2.2/ChangeLog.sync-restart	2007-05-02 13:07:21.719425000 -0400
++++ libvirt-0.2.2/ChangeLog	2007-05-02 13:08:23.204879000 -0400
+@@ -0,0 +1,5 @@
++Wed May  2 17:55:12 IST 2007 Mark McLoughlin <markmc@redhat.com>
++
++	* qemud/libvirtd.in: synchronously restart the daemon in
++	order to avoid https://bugzilla.redhat.com/238492
++	
+--- libvirt-0.2.2/qemud/libvirtd.in.sync-restart	2007-02-23 07:50:58.000000000 -0500
++++ libvirt-0.2.2/qemud/libvirtd.in	2007-05-02 13:08:23.209868000 -0400
+@@ -34,7 +34,7 @@
+ stop() {
+     echo -n $"Stopping $SERVICE daemon: "
+ 
+-    killproc $PROCESS -TERM
++    killproc $PROCESS
+     RETVAL=$?
+     echo
+     if [ $RETVAL -eq 0 ]; then

libvirt-0.6.4-svirt-sound.patch

@@ -1,51 +0,0 @@
-From 127a39777e9809053bb98a9082e27c73543ccfa2 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 17 Aug 2009 08:32:08 +0100
-Subject: [PATCH] Disable sound cards when running sVirt
-
-Temporary hack till PulseAudio autostart problems are sorted out when
-SELinux enforcing (bz 486112)
-
-Fedora-patch: libvirt-0.6.4-svirt-sound.patch
----
- src/qemu_conf.c |   17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index f92bcef..f3b4ef0 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -1510,6 +1510,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
-     char uuid[VIR_UUID_STRING_BUFLEN];
-     char domid[50];
-     const char *cpu = NULL;
-+    int skipSound = 0;
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->name &&
-+        STREQ(driver->securityDriver->name, "selinux") &&
-+        getuid() == 0) {
-+        static int soundWarned = 0;
-+        skipSound = 1;
-+        if (def->nsounds &&
-+            !soundWarned) {
-+            soundWarned = 1;
-+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
-+        }
-+    }
- 
-     uname_normalize(&ut);
- 
-@@ -2181,7 +2195,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
-     }
- 
-     /* Add sound hardware */
--    if (def->nsounds) {
-+    if (def->nsounds &&
-+        !skipSound) {
-         int size = 100;
-         char *modstr;
-         if (VIR_ALLOC_N(modstr, size+1) < 0)
--- 
-1.6.2.5
-

libvirt-fix-drv-supports-feature-bogus-error.patch

@@ -1,32 +0,0 @@
-From 2f6e857ac7d6ed5cd417e684147dd9c98775ab3d Mon Sep 17 00:00:00 2001
-From: Chris Lalancette <clalance@redhat.com>
-Date: Mon, 21 Sep 2009 14:53:31 +0200
-Subject: [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.
-
-Signed-off-by: Chris Lalancette <clalance@redhat.com>
-Fedora-patch: libvirt-fix-drv-supports-feature-bogus-error.patch
----
- src/libvirt.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/libvirt.c b/src/libvirt.c
-index 4a11688..fa59dc7 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -1349,8 +1349,11 @@ virDrvSupportsFeature (virConnectPtr conn, int feature)
-     }
- 
-     ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature);
--    /* Copy to connection error object for back compatability */
--    virSetConnError(conn);
-+
-+    if (ret < 0)
-+        /* Copy to connection error object for back compatability */
-+        virSetConnError(conn);
-+
-     return ret;
- }
- 
--- 
-1.6.2.5
-

libvirt-fix-net-hotunplug-double-free.patch

@@ -1,46 +0,0 @@
-From d09ff3c35c29d14760d5ea03559042cc024e09ab Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 17 Sep 2009 15:31:08 +0100
-Subject: [PATCH] Fix net/disk hot-unplug segfault
-
-When we hot-unplug the last device, we're currently double-freeing
-the device definition.
-
-Reported by Michal Nowak here:
-
-  https://bugzilla.redhat.com/523953
-
-* src/qemu_driver.c: fix double free
-
-(cherry-picked from commit 8881ae1bf8783006777429403cc543c33187175d)
-
-Fedora-patch: libvirt-fix-net-hotunplug-double-free.patch
----
- src/qemu_driver.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index a65334f..de31581 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -5998,7 +5998,7 @@ try_command:
-             /* ignore, harmless */
-         }
-     } else {
--        VIR_FREE(vm->def->disks[0]);
-+        VIR_FREE(vm->def->disks);
-         vm->def->ndisks = 0;
-     }
-     virDomainDiskDefFree(detach);
-@@ -6100,7 +6100,7 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
-             /* ignore, harmless */
-         }
-     } else {
--        VIR_FREE(vm->def->nets[0]);
-+        VIR_FREE(vm->def->nets);
-         vm->def->nnets = 0;
-     }
-     virDomainNetDefFree(detach);
--- 
-1.6.2.5
-

libvirt-fix-pci-hostdev-hotunplug-leak.patch

@@ -1,50 +0,0 @@
-From d04ac8624f5fabe7587982796f2e2161220b0fcc Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 17 Sep 2009 15:32:45 +0100
-Subject: [PATCH] Fix leak in PCI hostdev hot-unplug
-
-* src/qemu_driver.c: sync the hostdev hot-unplug code with the disk/net
-  code.
-
-(cherry-picked from commit a70da51ff76ed860bfc0cdee2e1d556da997c557)
-
-Fedora-patch: libvirt-fix-pci-hostdev-hotunplug-leak.patch
----
- src/qemu_driver.c |   20 +++++++++++++-------
- 1 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index de31581..2ddcdc0 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -6206,14 +6206,20 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
-         pciFreeDevice(conn, pci);
-     }
- 
--    if (i != --vm->def->nhostdevs)
--        memmove(&vm->def->hostdevs[i],
--                &vm->def->hostdevs[i+1],
--                sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i));
--    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
--        virReportOOMError(conn);
--        ret = -1;
-+    if (vm->def->nhostdevs > 1) {
-+        memmove(vm->def->hostdevs + i,
-+                vm->def->hostdevs + i + 1,
-+                sizeof(*vm->def->hostdevs) *
-+                (vm->def->nhostdevs - (i + 1)));
-+        vm->def->nhostdevs--;
-+        if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
-+            /* ignore, harmless */
-+        }
-+    } else {
-+        VIR_FREE(vm->def->hostdevs);
-+        vm->def->nhostdevs = 0;
-     }
-+    virDomainHostdevDefFree(detach);
- 
-     return ret;
- }
--- 
-1.6.2.5
-

libvirt-fix-qemu-raw-format-save.patch

@@ -1,53 +0,0 @@
-From e50c91fdcea5d81e3eb2051c05f4e51a16c3e692 Mon Sep 17 00:00:00 2001
-From: Charles Duffy <Charles_Duffy@dell.com>
-Date: Fri, 18 Sep 2009 11:32:35 -0500
-Subject: [PATCH] Prevent attempt to call cat -c during virDomainSave to raw
-
-Fedora-patch: libvirt-fix-qemu-raw-format-save.patch
----
- src/qemu_driver.c |   28 ++++++++++++++++++----------
- 1 files changed, 18 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 2ddcdc0..7c7b985 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -3905,17 +3905,25 @@ static int qemudDomainSave(virDomainPtr dom,
-         goto cleanup;
-     }
- 
--    const char *prog = qemudSaveCompressionTypeToString(header.compressed);
--    if (prog == NULL) {
--        qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
--                         _("Invalid compress format %d"), header.compressed);
--        goto cleanup;
--    }
-+    {
-+        const char *prog = qemudSaveCompressionTypeToString(header.compressed);
-+        const char *args;
- 
--    if (STREQ (prog, "raw"))
--        prog = "cat";
--    internalret = virAsprintf(&command, "migrate \"exec:"
--                              "%s -c >> '%s' 2>/dev/null\"", prog, safe_path);
-+        if (prog == NULL) {
-+            qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
-+                             _("Invalid compress format %d"), header.compressed);
-+            goto cleanup;
-+        }
-+
-+        if (STREQ (prog, "raw")) {
-+            prog = "cat";
-+            args = "";
-+        } else {
-+            args = "-c";
-+        }
-+        internalret = virAsprintf(&command, "migrate \"exec:"
-+                                  "%s %s >> '%s' 2>/dev/null\"", prog, args, safe_path);
-+    }
- 
-     if (internalret < 0) {
-         virReportOOMError(dom->conn);
--- 
-1.6.2.5
-

sources

@@ -1 +1 @@
-f1cd360a5da38b847e166c6482141940  libvirt-0.7.1.tar.gz
+3b9e192de1777c8ec801d16cbf1c7819  libvirt-0.2.3.tar.gz