* Mon Oct 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-13

- Misc fixes to qemu machine types handling - A couple of XML formatting fixes
Add the second patch for #523158
2009-10-19 10:14:07 +00:00 · 2009-10-13 15:43:51 +00:00 · 2009-10-13 15:34:19 +00:00 · 2009-10-09 14:55:28 +00:00 · 2009-10-06 12:42:16 +00:00 · 2009-10-06 09:43:52 +00:00
32 changed files with 2489 additions and 939 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,8 +11,3 @@ 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.7.2.tar.gz
-libvirt-0.7.3.tar.gz
-libvirt-0.7.4.tar.gz
-libvirt-0.7.5.tar.gz
-libvirt-0.7.6.tar.gz
--- a/2
+++ b/2
@@ -4,7 +4,7 @@ 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 $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+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))
--- a/2
+++ b/2
@@ -1 +1 @@
-F-13
+F-12
--- a/libvirt-0.7.7-fix-cdrom-change.patch
+++ b/libvirt-0.7.7-fix-cdrom-change.patch
@@ -1,132 +0,0 @@
-commit c4896d378b921ba6471562d7b17641be121c19d6
-Author: Daniel P. Berrange <berrange@redhat.com>
-Date:   Thu Apr 15 11:35:07 2010 +0100
-
-    Fix CDROM media change for QEMU when using -device syntax
-    
-    Disk devices in QEMU have two parts, the guest device and the host
-    backend driver. Historically these two parts have had the same
-    "unique" name. With the switch to using -device though, they now
-    have separate names. Thus when changing CDROM media, for guests
-    using -device syntax, we need to prepend the QEMU_DRIVE_HOST_PREFIX
-    constant
-    
-    * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h: Add helper function
-      qemuDeviceDriveHostAlias() for building a host backend alias
-    * src/qemu/qemu_driver.c: Use qemuDeviceDriveHostAlias() to determine
-      the host backend alias for performing eject/change commands in the
-      monitor
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 1a8b4aa..0cbedf2 100644
--- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -1699,6 +1699,26 @@ static int qemuAssignDeviceDiskAliasLegacy(virDomainDiskDefPtr disk)
- }
- 
- 
-+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
-+                               unsigned long long qemudCmdFlags)
-+{
-+    char *ret;
-+
-+    if (qemudCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
-+        if (virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) {
-+            virReportOOMError();
-+            return NULL;
-+        }
-+    } else {
-+        if (!(ret = strdup(disk->info.alias))) {
-+            virReportOOMError();
-+            return NULL;
-+        }
-+    }
-+    return ret;
-+}
-+
-+
- /* Names used before -drive supported the id= option */
- static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
- {
-diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index 574709e..b2820f0 100644
--- a/src/qemu/qemu_conf.h
-+++ b/src/qemu/qemu_conf.h
-@@ -220,6 +220,9 @@ char * qemuBuildNicStr(virDomainNetDefPtr net,
- char * qemuBuildNicDevStr(virDomainNetDefPtr net,
-                           int vlan);
- 
-+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
-+                               unsigned long long qemudCmdFlags);
-+
- /* Both legacy & current support */
- char *qemuBuildDriveStr(virDomainDiskDefPtr disk,
-                         int bootable,
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 0189dcf..7d2f3ef 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6552,11 +6552,13 @@ cleanup:
- 
- static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-                                            virDomainObjPtr vm,
-                                           virDomainDiskDefPtr disk)
-+                                           virDomainDiskDefPtr disk,
-+                                           unsigned long long qemuCmdFlags)
- {
-     virDomainDiskDefPtr origdisk = NULL;
-     int i;
-     int ret;
-+    char *driveAlias = NULL;
- 
-     origdisk = NULL;
-     for (i = 0 ; i < vm->def->ndisks ; i++) {
-@@ -6594,6 +6596,9 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-         driver->securityDriver->domainSetSecurityImageLabel(vm, disk) < 0)
-         return -1;
- 
-+    if (!(driveAlias = qemuDeviceDriveHostAlias(origdisk, qemuCmdFlags)))
-+        goto error;
-+
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     qemuDomainObjEnterMonitorWithDriver(driver, vm);
-     if (disk->src) {
-@@ -6605,10 +6610,10 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-                 format = origdisk->driverType;
-         }
-         ret = qemuMonitorChangeMedia(priv->mon,
-                                     origdisk->info.alias,
-+                                     driveAlias,
-                                      disk->src, format);
-     } else {
-        ret = qemuMonitorEjectMedia(priv->mon, origdisk->info.alias);
-+        ret = qemuMonitorEjectMedia(priv->mon, driveAlias);
-     }
-     qemuDomainObjExitMonitorWithDriver(driver, vm);
- 
-@@ -6625,11 +6630,14 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-     disk->src = NULL;
-     origdisk->type = disk->type;
- 
-+    VIR_FREE(driveAlias);
-+
-     virDomainDiskDefFree(disk);
- 
-     return ret;
- 
- error:
-+    VIR_FREE(driveAlias);
-     if (driver->securityDriver &&
-         driver->securityDriver->domainRestoreSecurityImageLabel &&
-         driver->securityDriver->domainRestoreSecurityImageLabel(vm, disk) < 0)
-@@ -7434,7 +7442,9 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
-         switch (dev->data.disk->device) {
-         case VIR_DOMAIN_DISK_DEVICE_CDROM:
-         case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
-            ret = qemudDomainChangeEjectableMedia(driver, vm, dev->data.disk);
-+            ret = qemudDomainChangeEjectableMedia(driver, vm,
-+                                                  dev->data.disk,
-+                                                  qemuCmdFlags);
-             if (ret == 0)
-                 dev->data.disk = NULL;
-             break;
--- a/libvirt-0.7.7-fix-slow-dsync.patch
+++ b/libvirt-0.7.7-fix-slow-dsync.patch
@@ -1,41 +0,0 @@
-From e3c36a2575bc88a16d776693dc39ea01c780b406 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 16 Mar 2010 16:03:59 +0100
-Subject: [PATCH] Use fsync() at the end of file allocation instead of O_DSYNC
-
-Instead of opening storage file with O_DSYNC, make sure data are written
-to a disk only before we claim allocation has finished.
---
- src/storage/storage_backend.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
-index ec9fc43..7294a00 100644
--- a/src/storage/storage_backend.c
-+++ b/src/storage/storage_backend.c
-@@ -331,6 +331,13 @@ static int createRawFileOpHook(int fd, void *data) {
-                 goto cleanup;
-             }
-         }
-+
-+        if (fsync(fd) < 0) {
-+            ret = errno;
-+            virReportSystemError(errno, _("cannot sync data to file '%s'"),
-+                                 hdata->vol->target.path);
-+            goto cleanup;
-+        }
-     }
- 
- cleanup:
-@@ -359,7 +366,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED,
-     gid_t gid = (vol->target.perms.gid == -1) ? getgid() : vol->target.perms.gid;
- 
-     if ((createstat = virFileOperation(vol->target.path,
-                                       O_RDWR | O_CREAT | O_EXCL | O_DSYNC,
-+                                       O_RDWR | O_CREAT | O_EXCL,
-                                        vol->target.perms.mode, uid, gid,
-                                        createRawFileOpHook, &hdata,
-                                        VIR_FILE_OP_FORCE_PERMS |
-- 
-1.6.6.1
-
--- a/libvirt-0.7.7-fix-usb-product.patch
+++ b/libvirt-0.7.7-fix-usb-product.patch
@@ -1,233 +0,0 @@
-From 3a441522017aa9c1b8b54d2ce4569d0f0d96fa72 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Fri, 12 Mar 2010 12:36:56 -0500
-Subject: [PATCH] qemu: Add some debugging at domain startup
-
---
- src/qemu/qemu_driver.c |   24 +++++++++++++++++++++++-
- 1 files changed, 23 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index f8ab545..040d645 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2695,6 +2695,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- 
-     FD_ZERO(&keepfd);
- 
-+    DEBUG0("Beginning VM startup process");
-+
-     if (virDomainObjIsActive(vm)) {
-         qemuReportError(VIR_ERR_OPERATION_INVALID,
-                         "%s", _("VM is already active"));
-@@ -2703,22 +2705,27 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- 
-     /* If you are using a SecurityDriver with dynamic labelling,
-        then generate a security label for isolation */
-+    DEBUG0("Generating domain security label (if required)");
-     if (driver->securityDriver &&
-         driver->securityDriver->domainGenSecurityLabel &&
-         driver->securityDriver->domainGenSecurityLabel(vm) < 0)
-         return -1;
- 
-+    DEBUG0("Generating setting domain security labels (if required)");
-     if (driver->securityDriver &&
-         driver->securityDriver->domainSetSecurityAllLabel &&
-         driver->securityDriver->domainSetSecurityAllLabel(vm) < 0)
-         goto cleanup;
- 
-    /* Ensure no historical cgroup for this VM is lieing around bogus settings */
-+    /* Ensure no historical cgroup for this VM is lying around bogus
-+     * settings */
-+    DEBUG0("Ensuring no historical cgroup is lying around");
-     qemuRemoveCgroup(driver, vm, 1);
- 
-     if ((vm->def->ngraphics == 1) &&
-         vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
-         vm->def->graphics[0]->data.vnc.autoport) {
-+        DEBUG0("Determining VNC port");
-         int port = qemudNextFreeVNCPort(driver);
-         if (port < 0) {
-             qemuReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -2735,6 +2742,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    DEBUG0("Creating domain log file");
-     if ((logfile = qemudLogFD(driver, vm->def->name)) < 0)
-         goto cleanup;
- 
-@@ -2751,14 +2759,17 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    DEBUG0("Determing emulator version");
-     if (qemudExtractVersionInfo(emulator,
-                                 NULL,
-                                 &qemuCmdFlags) < 0)
-         goto cleanup;
- 
-+    DEBUG0("Setting up domain cgroup (if required)");
-     if (qemuSetupCgroup(driver, vm) < 0)
-         goto cleanup;
- 
-+    DEBUG0("Preparing host devices");
-     if (qemuPrepareHostDevices(driver, vm->def) < 0)
-         goto cleanup;
- 
-@@ -2767,6 +2778,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    DEBUG0("Preparing monitor state");
-     if (qemuPrepareMonitorChr(driver, priv->monConfig, vm->def->name) < 0)
-         goto cleanup;
- 
-@@ -2798,6 +2810,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-      * use in hotplug
-      */
-     if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
-+        DEBUG0("Assigning domain PCI addresses");
-         /* Populate cache with current addresses */
-         if (priv->pciaddrs) {
-             qemuDomainPCIAddressSetFree(priv->pciaddrs);
-@@ -2816,6 +2829,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         priv->persistentAddrs = 0;
-     }
- 
-+    DEBUG0("Building emulator command line");
-     vm->def->id = driver->nextvmid++;
-     if (qemudBuildCommandLine(conn, driver, vm->def, priv->monConfig,
-                               priv->monJSON, qemuCmdFlags, &argv, &progenv,
-@@ -2899,25 +2913,31 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     if (ret == -1) /* The VM failed to start */
-         goto cleanup;
- 
-+    DEBUG0("Waiting for monitor to show up");
-     if (qemudWaitForMonitor(driver, vm, pos) < 0)
-         goto abort;
- 
-+    DEBUG0("Detecting VCPU PIDs");
-     if (qemuDetectVcpuPIDs(driver, vm) < 0)
-         goto abort;
- 
-+    DEBUG0("Setting CPU affinity");
-     if (qemudInitCpuAffinity(vm) < 0)
-         goto abort;
- 
-+    DEBUG0("Setting any required VM passwords");
-     if (qemuInitPasswords(conn, driver, vm, qemuCmdFlags) < 0)
-         goto abort;
- 
-     /* If we have -device, then addresses are assigned explicitly.
-      * If not, then we have to detect dynamic ones here */
-     if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) {
-+        DEBUG0("Determining domain device PCI addresses");
-         if (qemuInitPCIAddresses(driver, vm) < 0)
-             goto abort;
-     }
- 
-+    DEBUG0("Setting initial memory amount");
-     qemuDomainObjEnterMonitorWithDriver(driver, vm);
-     if (qemuMonitorSetBalloon(priv->mon, vm->def->memory) < 0) {
-         qemuDomainObjExitMonitorWithDriver(driver, vm);
-@@ -2925,6 +2945,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     }
- 
-     if (migrateFrom == NULL) {
-+        DEBUG0("Starting domain CPUs");
-         /* Allow the CPUS to start executing */
-         if (qemuMonitorStartCPUs(priv->mon, conn) < 0) {
-             if (virGetLastError() == NULL)
-@@ -2937,6 +2958,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     qemuDomainObjExitMonitorWithDriver(driver, vm);
- 
- 
-+    DEBUG0("Writing domain status to disk");
-     if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0)
-         goto abort;
- 
-- 
-1.6.6.1
-
-From 6d5c8a8f51db8ce97ab35ab6022dd5c94ab016b4 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Fri, 12 Mar 2010 12:37:52 -0500
-Subject: [PATCH] qemu: Fix USB by product with security enabled
-
-We need to call PrepareHostdevs to determine the USB device path before
-any security calls. PrepareHostUSBDevices was also incorrectly skipping
-all USB devices.
---
- src/qemu/qemu_driver.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 040d645..b17d26d 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2360,7 +2360,7 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED,
- 
-         if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-             continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)
-             continue;
- 
-         /* Resolve a vendor/product to bus/device */
-@@ -2703,6 +2703,11 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         return -1;
-     }
- 
-+    /* Must be run before security labelling */
-+    DEBUG0("Preparing host devices");
-+    if (qemuPrepareHostDevices(driver, vm->def) < 0)
-+        goto cleanup;
-+
-     /* If you are using a SecurityDriver with dynamic labelling,
-        then generate a security label for isolation */
-     DEBUG0("Generating domain security label (if required)");
-@@ -2769,10 +2774,6 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     if (qemuSetupCgroup(driver, vm) < 0)
-         goto cleanup;
- 
-    DEBUG0("Preparing host devices");
-    if (qemuPrepareHostDevices(driver, vm->def) < 0)
-        goto cleanup;
-
-     if (VIR_ALLOC(priv->monConfig) < 0) {
-         virReportOOMError();
-         goto cleanup;
-- 
-1.6.6.1
-
-From 65e97240e6e4606820dd1c42ac172319e0af4d8d Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 22 Mar 2010 10:45:36 -0400
-Subject: [PATCH] security: selinux: Fix crash when releasing non-existent label
-
-This can be triggered by the qemuStartVMDaemon cleanup path if a
-VM references a non-existent USB device (by product) in the XML.
-
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- src/security/security_selinux.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 975b315..6680e2d 100644
--- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -632,7 +632,8 @@ SELinuxReleaseSecurityLabel(virDomainObjPtr vm)
- {
-     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
- 
-    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC)
-+    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC ||
-+        secdef->label == NULL)
-         return 0;
- 
-     context_t con = context_new(secdef->label);
-- 
-1.6.6.1
-
--- a/libvirt-0.7.7-no-secdriver-crash.patch
+++ b/libvirt-0.7.7-no-secdriver-crash.patch
@@ -1,26 +0,0 @@
-commit b7a7b3365145f6e9e434a3265a58666cd2e6d8dd
-Author: Guido Günther <agx@sigxcpu.org>
-Date:   Wed Mar 17 21:04:11 2010 +0100
-
-    Don't crash without a security driver
-    
-    "virsh dominfo <vm>" crashes if there's no primary security driver set
-    since we only intialize the secmodel.model and secmodel.doi if we have
-    one. Attached patch checks for securityPrimaryDriver instead of
-    securityDriver since the later is always set in qemudSecurityInit().
-    
-    Closes: http://bugs.debian.org/574359
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 1f2b11d..257f914 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -4979,7 +4979,7 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn,
-     int ret = 0;
- 
-     qemuDriverLock(driver);
-    if (!driver->securityDriver) {
-+    if (!driver->securityPrimaryDriver) {
-         memset(secmodel, 0, sizeof (*secmodel));
-         goto cleanup;
-     }
--- a/libvirt-0.7.7-nodedev-conversions.patch
+++ b/libvirt-0.7.7-nodedev-conversions.patch
@@ -1,77 +0,0 @@
-commit 74c7a3463d18a530d6d749d0199061b5d3f17faa
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Tue May 11 14:44:34 2010 -0400
-
-    node_device: udev: Fix PCI product/vendor swappage
-    
-    Product and vendor values were swapped in the XML, which made virt-manager
-    PCI device listing kinda useless.
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index bcfe991..4a9d65f 100644
--- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -382,8 +382,8 @@ static int udevTranslatePCIIds(unsigned int vendor,
- 
-     /* pci_get_strings returns void */
-     pci_get_strings(&m,
-                    &vendor_name,
-                     &device_name,
-+                    &vendor_name,
-                     NULL,
-                     NULL);
- 
-commit 75d88455f54088f88bc7a503da0a4cd413ef7b95
-Author: Klaus Ethgen <Klaus@Ethgen.de>
-Date:   Tue Apr 27 09:20:47 2010 +0200
-
-    The base used for conversion of USB values should be 16 not 10.
-    
-    Signed-off-by: Guido Günther <agx@sigxcpu.org>
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index b12a49e..3a5a7e2 100644
--- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -548,8 +548,6 @@ out:
- }
- 
- 
-/* XXX Is 10 the correct base for the Number/Class/SubClass/Protocol
- * conversions?  */
- static int udevProcessUSBInterface(struct udev_device *device,
-                                    virNodeDeviceDefPtr def)
- {
-@@ -559,28 +557,28 @@ static int udevProcessUSBInterface(struct udev_device *device,
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceNumber",
-                              &data->usb_if.number,
-                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceClass",
-                              &data->usb_if._class,
-                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceSubClass",
-                              &data->usb_if.subclass,
-                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceProtocol",
-                              &data->usb_if.protocol,
-                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 
--- a/libvirt-0.7.7-pci-decimal-parsing.patch
+++ b/libvirt-0.7.7-pci-decimal-parsing.patch
@@ -1,50 +0,0 @@
-commit e984019688509605966c03cd77f4591d2cc222d3
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Fri Apr 30 18:14:35 2010 +0200
-
-    domain: Fix PCI address decimal parsing regression
-    
-    <hostdev> address parsing previously attempted to detect the number
-    base: currently it is hardcoded to base 16, which can break PCI
-    assignment via virt-manager. Revert to the previous behavior.
-    
-    * src/conf/domain_conf.c: virDomainDevicePCIAddressParseXML, switch to
-      virStrToLong_ui(bus, NULL, 0, ...) to autodetect base
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 1607e8b..546ddf2 100644
--- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1079,28 +1079,28 @@ virDomainDevicePCIAddressParseXML(xmlNodePtr node,
-     function = virXMLPropString(node, "function");
- 
-     if (domain &&
-        virStrToLong_ui(domain, NULL, 16, &addr->domain) < 0) {
-+        virStrToLong_ui(domain, NULL, 0, &addr->domain) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'domain' attribute"));
-         goto cleanup;
-     }
- 
-     if (bus &&
-        virStrToLong_ui(bus, NULL, 16, &addr->bus) < 0) {
-+        virStrToLong_ui(bus, NULL, 0, &addr->bus) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'bus' attribute"));
-         goto cleanup;
-     }
- 
-     if (slot &&
-        virStrToLong_ui(slot, NULL, 16, &addr->slot) < 0) {
-+        virStrToLong_ui(slot, NULL, 0, &addr->slot) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'slot' attribute"));
-         goto cleanup;
-     }
- 
-     if (function &&
-        virStrToLong_ui(function, NULL, 16, &addr->function) < 0) {
-+        virStrToLong_ui(function, NULL, 0, &addr->function) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'function' attribute"));
-         goto cleanup;
--- a/libvirt-0.7.7-qemu-startup-output.patch
+++ b/libvirt-0.7.7-qemu-startup-output.patch
@@ -1,108 +0,0 @@
-commit 83be64034a0b530c904ceb4fd1ed1c10b5cdf4bf
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Mon May 17 10:15:53 2010 -0400
-
-    qemu: Report cmdline output if VM dies early
-    
-    qemuReadLogOutput early VM death detection is racy and won't always work.
-    Startup then errors when connecting to the VM monitor. This won't report
-    the emulator cmdline output which is typically the most useful diagnostic.
-    
-    Check if the VM has died at the very end of the monitor connection step,
-    and if so, report the cmdline output.
-    
-    See also: https://bugzilla.redhat.com/show_bug.cgi?id=581381
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index ab6bec8..582fdee 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2034,39 +2034,47 @@ static void qemudFreePtyPath(void *payload, const char *name ATTRIBUTE_UNUSED)
-     VIR_FREE(payload);
- }
- 
-+static void
-+qemuReadLogFD(int logfd, char *buf, int maxlen, int off)
-+{
-+    int ret;
-+    char *tmpbuf = buf + off;
-+
-+    ret = saferead(logfd, tmpbuf, maxlen - off - 1);
-+    if (ret < 0) {
-+        ret = 0;
-+    }
-+
-+    tmpbuf[ret] = '\0';
-+}
-+
- static int
- qemudWaitForMonitor(struct qemud_driver* driver,
-                     virDomainObjPtr vm, off_t pos)
- {
-    char buf[4096]; /* Plenty of space to get startup greeting */
-+    char buf[4096] = ""; /* Plenty of space to get startup greeting */
-     int logfd;
-     int ret = -1;
-+    virHashTablePtr paths = NULL;
- 
-    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos))
-        < 0)
-+    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos)) < 0)
-         return -1;
- 
-    ret = qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
-                             qemudFindCharDevicePTYs,
-                             "console", 30);
-    if (close(logfd) < 0) {
-        char ebuf[4096];
-        VIR_WARN(_("Unable to close logfile: %s"),
-                 virStrerror(errno, ebuf, sizeof ebuf));
-    }
-
-    if (ret < 0)
-        return -1;
-+    if (qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
-+                           qemudFindCharDevicePTYs,
-+                           "console", 30) < 0)
-+        goto closelog;
- 
-     VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name);
-    if (qemuConnectMonitor(driver, vm) < 0)
-        return -1;
-+    if (qemuConnectMonitor(driver, vm) < 0) {
-+        goto cleanup;
-+    }
- 
-     /* Try to get the pty path mappings again via the monitor. This is much more
-      * reliable if it's available.
-      * Note that the monitor itself can be on a pty, so we still need to try the
-      * log output method. */
-    virHashTablePtr paths = virHashCreate(0);
-+    paths = virHashCreate(0);
-     if (paths == NULL) {
-         virReportOOMError();
-         goto cleanup;
-@@ -2087,6 +2095,23 @@ cleanup:
-         virHashFree(paths, qemudFreePtyPath);
-     }
- 
-+    if (kill(vm->pid, 0) == -1 && errno == ESRCH) {
-+        /* VM is dead, any other error raised in the interim is probably
-+         * not as important as the qemu cmdline output */
-+        qemuReadLogFD(logfd, buf, sizeof(buf), strlen(buf));
-+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
-+                        _("process exited while connecting to monitor: %s"),
-+                        buf);
-+        ret = -1;
-+    }
-+
-+closelog:
-+    if (close(logfd) < 0) {
-+        char ebuf[4096];
-+        VIR_WARN(_("Unable to close logfile: %s"),
-+                 virStrerror(errno, ebuf, sizeof ebuf));
-+    }
-+
-     return ret;
- }
- 
--- a/libvirt-0.7.7-set-kernel-perms.patch
+++ b/libvirt-0.7.7-set-kernel-perms.patch
@@ -1,87 +0,0 @@
-From 3f1aa08af6580c215d973bc6bf57f505dbf8b926 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Fri, 12 Mar 2010 13:38:39 -0500
-Subject: [PATCH] security: Set permissions for kernel/initrd
-
-Fixes URL installs when running virt-install as root on Fedora.
---
- src/qemu/qemu_security_dac.c    |   21 +++++++++++++++++++++
- src/security/security_selinux.c |   16 ++++++++++++++++
- 2 files changed, 37 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu/qemu_security_dac.c b/src/qemu/qemu_security_dac.c
-index 6911f48..1883fbe 100644
--- a/src/qemu/qemu_security_dac.c
-+++ b/src/qemu/qemu_security_dac.c
-@@ -332,6 +332,15 @@ qemuSecurityDACRestoreSecurityAllLabel(virDomainObjPtr vm)
-                                                      vm->def->disks[i]) < 0)
-             rc = -1;
-     }
-+
-+    if (vm->def->os.kernel &&
-+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
-+        rc = -1;
-+
-+    if (vm->def->os.initrd &&
-+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
-+        rc = -1;
-+
-     return rc;
- }
- 
-@@ -356,6 +365,18 @@ qemuSecurityDACSetSecurityAllLabel(virDomainObjPtr vm)
-             return -1;
-     }
- 
-+    if (vm->def->os.kernel &&
-+        qemuSecurityDACSetOwnership(vm->def->os.kernel,
-+                                    driver->user,
-+                                    driver->group) < 0)
-+        return -1;
-+
-+    if (vm->def->os.initrd &&
-+        qemuSecurityDACSetOwnership(vm->def->os.initrd,
-+                                    driver->user,
-+                                    driver->group) < 0)
-+        return -1;
-+
-     return 0;
- }
- 
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index b2c8581..975b315 100644
--- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -616,6 +616,14 @@ SELinuxRestoreSecurityAllLabel(virDomainObjPtr vm)
-             rc = -1;
-     }
- 
-+    if (vm->def->os.kernel &&
-+        SELinuxRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
-+        rc = -1;
-+
-+    if (vm->def->os.initrd &&
-+        SELinuxRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
-+        rc = -1;
-+
-     return rc;
- }
- 
-@@ -736,6 +744,14 @@ SELinuxSetSecurityAllLabel(virDomainObjPtr vm)
-             return -1;
-     }
- 
-+    if (vm->def->os.kernel &&
-+        SELinuxSetFilecon(vm->def->os.kernel, default_content_context) < 0)
-+        return -1;
-+
-+    if (vm->def->os.initrd &&
-+        SELinuxSetFilecon(vm->def->os.initrd, default_content_context) < 0)
-+        return -1;
-+
-     return 0;
- }
- 
-- 
-1.6.6.1
-
--- a/libvirt-change-logrotate-config-to-weekly.patch
+++ b/libvirt-change-logrotate-config-to-weekly.patch
@@ -0,0 +1,34 @@
+From bcd4180124afa20580d720912e2179b3a2f9295a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Mon, 5 Oct 2009 17:03:14 +0200
+Subject: [PATCH] 526769 change logrotate config default to weekly
+
+* daemon/libvirtd.logrotate.in: change to weekly rotation of logs,
+  keep a month worth of data and also extend to cover LXC and UML
+  domain logs
+
+(cherry picked from commit 529325bbdd050af89bda5a5c1a01b5553c49a57e)
+
+Fedora-patch: libvirt-change-logrotate-config-to-weekly.patch
+---
+ qemud/libvirtd.logrotate.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/qemud/libvirtd.logrotate.in b/qemud/libvirtd.logrotate.in
+index 9b42630..093651c 100644
+--- a/qemud/libvirtd.logrotate.in
+++ b/qemud/libvirtd.logrotate.in
+@@ -1,7 +1,7 @@
+-@localstatedir@/log/libvirt/qemu/*.log {
+-        daily
+@localstatedir@/log/libvirt/qemu/*.log @localstatedir@/log/libvirt/uml/*.log @localstatedir@/log/libvirt/lxc/*.log {
+        weekly
+         missingok
+-        rotate 7
+        rotate 4
+         compress
+         delaycompress
+         copytruncate
+-- 
+1.6.2.5
+
--- a/libvirt-disable-audio-backend.patch
+++ b/libvirt-disable-audio-backend.patch
@@ -0,0 +1,77 @@
+From 4721ceb9b85daabe53804627473b06ced821c695 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 14 Sep 2009 11:23:20 +0100
+Subject: [PATCH] Allow control over QEMU audio backend
+
+When using VNC for graphics + keyboard + mouse, we shouldn't
+then use the host OS for audio. Audio should go back over
+VNC.
+
+When using SDL for graphics, we should use the host OS for
+audio since that's where the display is. We need to allow
+certain QEMU env variables to be passed through to guest
+too to allow choice of QEMU audio backend.
+
+* qemud/libvirtd.sysconf: Mention QEMU/SDL audio env vars
+* src/qemu_conf.c: Passthrough QEMU/SDL audio env for SDL display,
+  disable host audio for VNC display
+
+(cherry picked from commit b08e6d38ae7a0ed70300d7d82107f83fddb60f44)
+
+Fedora-patch: libvirt-disable-audio-backend.patch
+---
+ qemud/libvirtd.sysconf |    8 ++++++++
+ src/qemu_conf.c        |   14 ++++++++++++++
+ 2 files changed, 22 insertions(+), 0 deletions(-)
+
+diff --git a/qemud/libvirtd.sysconf b/qemud/libvirtd.sysconf
+index fe4596a..28080a0 100644
+--- a/qemud/libvirtd.sysconf
+++ b/qemud/libvirtd.sysconf
+@@ -7,3 +7,11 @@
+ 
+ # Override Kerberos service keytab for SASL/GSSAPI
+ #KRB5_KTNAME=/etc/libvirt/krb5.tab
+
+# Override the QEMU/SDL default audio driver probing when
+# starting virtual machines using SDL graphics
+#
+# NB these have no effect for VMs using VNC
+#QEMU_AUDIO_DRV=sdl
+#
+#SDL_AUDIODRIVER=pulse
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index f92bcef..0dd0624 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -2109,6 +2109,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
+             ADD_ARG_LIT("-k");
+             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
+         }
+
+        /* QEMU implements a VNC extension for providing audio, so we
+         * set the audio backend to none, to prevent it opening the
+         * host OS audio devices since that causes security issues
+         * and is non-sensical when using VNC.
+         */
+        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
+     } else if ((def->ngraphics == 1) &&
+                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
+         char *xauth = NULL;
+@@ -2131,6 +2138,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
+             ADD_ENV(display);
+         if (def->graphics[0]->data.sdl.fullscreen)
+             ADD_ARG_LIT("-full-screen");
+
+        /* If using SDL for video, then we should just let it
+         * use QEMU's host audio drivers, possibly SDL too
+         * User can set these two before starting libvirtd
+         */
+        ADD_ENV_COPY("QEMU_AUDIO_DRV");
+        ADD_ENV_COPY("SDL_AUDIODRIVER");
+     }
+ 
+     if (def->nvideos) {
+-- 
+1.6.2.5
+
--- a/libvirt-fix-device-detach-typo1.patch
+++ b/libvirt-fix-device-detach-typo1.patch
@@ -0,0 +1,29 @@
+From 58c38896a67c170063401d8091bae7dca8842923 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 23 Sep 2009 18:46:23 +0200
+Subject: [PATCH] Fix a typo in virDiskHasValidPciAddr()
+
+(cherry-picked from commit 3620e3cdcfe56cc4475b5ef1a0a893757240b795)
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Fedora-patch: libvirt-fix-device-detach-typo1.patch
+---
+ src/domain_conf.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/domain_conf.h b/src/domain_conf.h
+index 09368d9..d494e54 100644
+--- a/src/domain_conf.h
+++ b/src/domain_conf.h
+@@ -125,7 +125,7 @@ struct _virDomainDiskDef {
+ static inline int
+ virDiskHasValidPciAddr(virDomainDiskDefPtr def)
+ {
+-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
+    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
+ }
+ 
+ 
+-- 
+1.6.2.5
+
--- a/libvirt-fix-device-detach-typo2.patch
+++ b/libvirt-fix-device-detach-typo2.patch
@@ -0,0 +1,30 @@
+From 81e967c716ce8c085be8baad9169f7772452d187 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 24 Sep 2009 08:55:55 +0100
+Subject: [PATCH] Fix a typo in virNetHasValidPciAddr() too
+
+* src/domain_conf.h: check domain/bus/slot, not domain/domain/slot
+
+(cherry-picked from commit 6bfffce91635bb08de601747e94ed1182c0f47eb)
+
+Fedora-patch: libvirt-fix-device-detach-typo2.patch
+---
+ src/domain_conf.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/domain_conf.h b/src/domain_conf.h
+index d494e54..7c918a7 100644
+--- a/src/domain_conf.h
+++ b/src/domain_conf.h
+@@ -207,7 +207,7 @@ struct _virDomainNetDef {
+ static inline int
+ virNetHasValidPciAddr(virDomainNetDefPtr def)
+ {
+-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
+    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
+ }
+ 
+ enum virDomainChrSrcType {
+-- 
+1.6.2.5
+
--- a/libvirt-fix-device-detach-typo3.patch
+++ b/libvirt-fix-device-detach-typo3.patch
@@ -0,0 +1,30 @@
+From 3a64779ec5a89d38d64e07bca2b11b19e1882d7a Mon Sep 17 00:00:00 2001
+From: Charles Duffy <charles@dyfis.net>
+Date: Thu, 24 Sep 2009 09:00:24 +0100
+Subject: [PATCH] Fix unitialized variable in qemudDomainDetachHostPciDevice()
+
+* src/qemu_driver.c: initialize detach var
+
+(cherry-picked from commit 580ad29288751234bee47ac9f6c04dac1dc529ea)
+
+Fedora-patch: libvirt-fix-device-detach-typo3.patch
+---
+ src/qemu_driver.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 7c7b985..550a59c 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -6126,7 +6126,7 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
+                                           virDomainObjPtr vm,
+                                           virDomainDeviceDefPtr dev)
+ {
+-    virDomainHostdevDefPtr detach;
+    virDomainHostdevDefPtr detach = NULL;
+     char *cmd, *reply;
+     int i, ret;
+     pciDevice *pci;
+-- 
+1.6.2.5
+
--- a/libvirt-fix-drv-supports-feature-bogus-error.patch
+++ b/libvirt-fix-drv-supports-feature-bogus-error.patch
@@ -0,0 +1,32 @@
+From 7692e1e19487c28454b1e5f6488d5574c70883f2 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
+
--- a/libvirt-fix-libvirtd-leak-in-error-reply.patch
+++ b/libvirt-fix-libvirtd-leak-in-error-reply.patch
@@ -0,0 +1,79 @@
+From 71de8d92f20a9a9ee76d4d5df77ff477f1b7d441 Mon Sep 17 00:00:00 2001
+From: Matthias Bolte <matthias.bolte@googlemail.com>
+Date: Wed, 30 Sep 2009 02:17:27 +0200
+Subject: [PATCH] Fix memory leaks in libvirtd's message processing
+
+Commit 47cab734995fa9521b1df05d37e9978eedd8d3a2 changed the way how
+qemud_client_message objects were reused. Before this commit
+remoteDispatchClientRequest() reused the received message for normal responses
+and to report non-fatal errors. If a fatal error occurred qemudWorker() frees
+the message. After this commit non-fatal errors are reported by
+remoteSerializeReplyError() using a new qemud_client_message object and the
+original message leaks.
+
+To fix this leak the original message has to be freed if
+remoteSerializeReplyError() succeeds. If remoteSerializeReplyError()
+fails the original message is freed in qemudWorker().
+
+* daemon/dispatch.c: free qemud_client_message objects that will not be reused
+  and would leak otherwise, also free the allocated qemud_client_message object
+  in remoteSerializeError() if an error occurs
+
+(cherry-picked from commit c6f1459eb998619ab21a92d9bb87341f26978181)
+
+Fedora-patch: libvirt-fix-libvirtd-leak-in-error-reply.patch
+---
+ qemud/dispatch.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/qemud/dispatch.c b/qemud/dispatch.c
+index a60f2f4..ddb3215 100644
+--- a/qemud/dispatch.c
+++ b/qemud/dispatch.c
+@@ -191,6 +191,7 @@ remoteSerializeError(struct qemud_client *client,
+ 
+ xdr_error:
+     xdr_destroy(&xdr);
+    VIR_FREE(msg);
+ fatal_error:
+     xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
+     return -1;
+@@ -336,6 +337,7 @@ remoteDispatchClientRequest (struct qemud_server *server,
+                              struct qemud_client *client,
+                              struct qemud_client_message *msg)
+ {
+    int ret;
+     remote_error rerr;
+ 
+     memset(&rerr, 0, sizeof rerr);
+@@ -364,7 +366,12 @@ remoteDispatchClientRequest (struct qemud_server *server,
+     }
+ 
+ error:
+-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
+
+    if (ret >= 0)
+        VIR_FREE(msg);
+
+    return ret;
+ }
+ 
+ 
+@@ -521,8 +528,12 @@ remoteDispatchClientCall (struct qemud_server *server,
+ rpc_error:
+     /* Semi-bad stuff happened, we can still try to send back
+      * an RPC error message to client */
+-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
+
+    if (rv >= 0)
+        VIR_FREE(msg);
+ 
+    return rv;
+ 
+ xdr_error:
+     /* Seriously bad stuff happened, so we'll kill off this client
+-- 
+1.6.2.5
+
--- a/libvirt-fix-net-hotunplug-double-free.patch
+++ b/libvirt-fix-net-hotunplug-double-free.patch
@@ -0,0 +1,46 @@
+From ba585ed6cff624c6c0f1f9801382fd6846466ee0 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
+
--- a/libvirt-fix-pci-hostdev-hotunplug-leak.patch
+++ b/libvirt-fix-pci-hostdev-hotunplug-leak.patch
@@ -0,0 +1,50 @@
+From 17831d20051f8de8f1f7d661e8a23f4fe67c2153 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
+
--- a/libvirt-fix-qemu-raw-format-save.patch
+++ b/libvirt-fix-qemu-raw-format-save.patch
@@ -0,0 +1,53 @@
+From f1be5a4714e194a84840343e0937fe62463a18dc 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
+
--- a/libvirt-fix-qemu-restore-from-raw1.patch
+++ b/libvirt-fix-qemu-restore-from-raw1.patch
@@ -0,0 +1,38 @@
+From 0b846a30468a6b4586407f020ccde7bb51afaf98 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 12 Oct 2009 20:03:50 +0100
+Subject: [PATCH] Fix QEMU restore from file in raw format
+
+The logic for running the decompression programs was broken in
+commit f238709304f9f6c57204cdd943e542cbae38fa5f, so that for
+non-raw formats the decompression program was never run, and
+for raw formats, it tried to exec an argv[] with initial NULL
+in the program name.
+
+* src/qemu/qemu_driver.c: Fix logic in runing decompression program
+
+(cherry picked from commit 74b379cbd5ba9f472a3a2d5710e497966b1a3a37)
+
+Fedora-patch: libvirt-fix-qemu-restore-from-raw1.patch
+---
+ src/qemu_driver.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 550a59c..0ce403c 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -4541,9 +4541,8 @@ static int qemudDomainRestore(virConnectPtr conn,
+             goto cleanup;
+         }
+ 
+-        if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
+        if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
+             intermediate_argv[0] = prog;
+-        else {
+             intermediatefd = fd;
+             fd = -1;
+             if (virExec(conn, intermediate_argv, NULL, NULL,
+-- 
+1.6.2.5
+
--- a/libvirt-fix-qemu-restore-from-raw2.patch
+++ b/libvirt-fix-qemu-restore-from-raw2.patch
@@ -0,0 +1,120 @@
+From 57d7cc602d14c6b50e2826e427a5de124e479f95 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 12 Oct 2009 20:32:33 +0100
+Subject: [PATCH] Fix virFileReadLimFD/virFileReadAll to handle EINTR
+
+The fread_file_lim() function uses fread() but never handles
+EINTR results, causing unexpected failures when reading QEMU
+help arg info. It was unneccessarily using FILE * instead
+of plain UNIX file handles, which prevented use of saferead()
+
+* src/util/util.c: Switch fread_file_lim over to use saferead
+  instead of fread, remove FILE * use, and rename
+
+(cherry picked from commit 11a36d956cb8a5e439e535bff3e0cfce50a64bca)
+
+Fedora-patch: libvirt-fix-qemu-restore-from-raw2.patch
+---
+ src/util.c |   45 ++++++++++++---------------------------------
+ 1 files changed, 12 insertions(+), 33 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index 1878e33..7bc3a66 100644
+--- a/src/util.c
+++ b/src/util.c
+@@ -887,7 +887,7 @@ virExec(virConnectPtr conn,
+    number of bytes.  If the length of the input is <= max_len, and
+    upon error while reading that data, it works just like fread_file.  */
+ static char *
+-fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+saferead_lim (int fd, size_t max_len, size_t *length)
+ {
+     char *buf = NULL;
+     size_t alloc = 0;
+@@ -895,8 +895,8 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+     int save_errno;
+ 
+     for (;;) {
+-        size_t count;
+-        size_t requested;
+        int count;
+        int requested;
+ 
+         if (size + BUFSIZ + 1 > alloc) {
+             alloc += alloc / 2;
+@@ -912,12 +912,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+         /* Ensure that (size + requested <= max_len); */
+         requested = MIN (size < max_len ? max_len - size : 0,
+                          alloc - size - 1);
+-        count = fread (buf + size, 1, requested, stream);
+        count = saferead (fd, buf + size, requested);
+         size += count;
+ 
+         if (count != requested || requested == 0) {
+             save_errno = errno;
+-            if (ferror (stream))
+            if (count < 0)
+                 break;
+             buf[size] = '\0';
+             *length = size;
+@@ -930,12 +930,12 @@ fread_file_lim (FILE *stream, size_t max_len, size_t *length)
+     return NULL;
+ }
+ 
+-/* A wrapper around fread_file_lim that maps a failure due to
+/* A wrapper around saferead_lim that maps a failure due to
+    exceeding the maximum size limitation to EOVERFLOW.  */
+-static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
+int virFileReadLimFD(int fd, int maxlen, char **buf)
+ {
+     size_t len;
+-    char *s = fread_file_lim (fp, maxlen+1, &len);
+    char *s = saferead_lim (fd, maxlen+1, &len);
+     if (s == NULL)
+         return -1;
+     if (len > maxlen || (int)len != len) {
+@@ -949,37 +949,16 @@ static int virFileReadLimFP(FILE *fp, int maxlen, char **buf)
+     return len;
+ }
+ 
+-/* Like virFileReadLimFP, but use a file descriptor rather than a FILE*.  */
+-int virFileReadLimFD(int fd_arg, int maxlen, char **buf)
+-{
+-    int fd = dup (fd_arg);
+-    if (fd >= 0) {
+-        FILE *fp = fdopen (fd, "r");
+-        if (fp) {
+-            int len = virFileReadLimFP (fp, maxlen, buf);
+-            int saved_errno = errno;
+-            fclose (fp);
+-            errno = saved_errno;
+-            return len;
+-        } else {
+-            int saved_errno = errno;
+-            close (fd);
+-            errno = saved_errno;
+-        }
+-    }
+-    return -1;
+-}
+-
+ int virFileReadAll(const char *path, int maxlen, char **buf)
+ {
+-    FILE *fh = fopen(path, "r");
+-    if (fh == NULL) {
+    int fd = open(path, O_RDONLY);
+    if (fd < 0) {
+         virReportSystemError(NULL, errno, _("Failed to open file '%s'"), path);
+         return -1;
+     }
+ 
+-    int len = virFileReadLimFP (fh, maxlen, buf);
+-    fclose(fh);
+    int len = virFileReadLimFD(fd, maxlen, buf);
+    close(fd);
+     if (len < 0) {
+         virReportSystemError(NULL, errno, _("Failed to read file '%s'"), path);
+         return -1;
+-- 
+1.6.2.5
+
--- a/libvirt-fix-usb-device-passthrough.patch
+++ b/libvirt-fix-usb-device-passthrough.patch
@@ -0,0 +1,41 @@
+From 6b12148864cf6a1d22a2cf4e0e9c48e9946331cb Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Wed, 30 Sep 2009 18:37:03 +0100
+Subject: [PATCH] Fix USB device re-labelling
+
+A simple misplaced break out of a switch results in:
+
+  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./vendor': No such file or directory
+  libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./device': No such file or directory
+  libvir: error : this function is not supported by the hypervisor: Failed to read product/vendor ID for 0000:00:54c.
+
+when trying to passthrough a USB host device to qemu.
+
+* src/security_selinux.c: fix a switch/break thinko
+
+Fedora-patch: libvirt-fix-usb-device-passthrough.patch
+---
+ src/security_selinux.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/security_selinux.c b/src/security_selinux.c
+index bc295b1..b4dc153 100644
+--- a/src/security_selinux.c
+++ b/src/security_selinux.c
+@@ -464,12 +464,11 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn,
+ 
+             ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm);
+             usbFreeDevice(conn, usb);
+-
+-            break;
+         } else {
+             /* XXX deal with product/vendor better */
+             ret = 0;
+         }
+        break;
+     }
+ 
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
+-- 
+1.6.2.5
+
--- a/libvirt-logrotate-create-lxc-uml-dirs.patch
+++ b/libvirt-logrotate-create-lxc-uml-dirs.patch
@@ -0,0 +1,54 @@
+From b7e3ac4f23befe67518b57e34691c301820a436c Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Tue, 6 Oct 2009 12:33:17 +0100
+Subject: [PATCH] Create /var/log/libvirt/{lxc,uml} dirs
+
+Otherwise logrotate barfs:
+
+  error: error accessing /var/log/libvirt/uml: No such file or directory
+  error: libvirtd:1 glob failed for /var/log/libvirt/uml/*.log
+  error: found error in /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/libvirt/lxc/*.log , skipping
+
+* qemud/Makefile.am: always create /var/log/libvirt/{lxc,uml} when
+  installing the logrotate conf; not ideal, but easier than making
+  the logrotate conf depend on which drivers are enabled
+
+Fedora-patch: libvirt-logrotate-create-lxc-uml-dirs.patch
+---
+ qemud/Makefile.am |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/qemud/Makefile.am b/qemud/Makefile.am
+index 3d143da..a7f4bdf 100644
+--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
+@@ -176,7 +176,7 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+ 	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
+            ln -s ../default.xml \
+ 	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
+ 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
+ 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
+ 
+@@ -184,7 +184,7 @@ uninstall-local:: uninstall-init uninstall-data-sasl install-data-polkit
+ 	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+ 	rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
+ 	rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
+-	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
+ 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
+ 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
+ 
+@@ -240,6 +240,8 @@ libvirtd.logrotate: libvirtd.logrotate.in
+ 
+ install-logrotate: libvirtd.logrotate
+ 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
+ 	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
+ 
+-- 
+1.6.2.5
+
--- a/libvirt-network-delay-attribute-formatting.patch
+++ b/libvirt-network-delay-attribute-formatting.patch
@@ -0,0 +1,32 @@
+From ba3bc9b22a21b8e9e110166c98be70e2ad6469cb Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Tue, 13 Oct 2009 11:31:27 -0400
+Subject: [PATCH] network: Fix printing XML 'delay' attribute
+
+When specifying bridge delay via network XML define, we were looking for
+the 'delay' attribute, but would dump the value as 'forwardDelay'. Have
+the output match the expected input (and schema).
+
+(cherry picked from commit 3b13aa3db37bf5a692bccfa015a01999043e797b)
+
+Fedora-patch: libvirt-network-delay-attribute-formatting.patch
+---
+ src/network_conf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/network_conf.c b/src/network_conf.c
+index 3764bb4..f75c457 100644
+--- a/src/network_conf.c
+++ b/src/network_conf.c
+@@ -587,7 +587,7 @@ char *virNetworkDefFormat(virConnectPtr conn,
+     virBufferAddLit(&buf, "  <bridge");
+     if (def->bridge)
+         virBufferEscapeString(&buf, " name='%s'", def->bridge);
+-    virBufferVSprintf(&buf, " stp='%s' forwardDelay='%ld' />\n",
+    virBufferVSprintf(&buf, " stp='%s' delay='%ld' />\n",
+                       def->stp ? "on" : "off",
+                       def->delay);
+ 
+-- 
+1.6.2.5
+
--- a/libvirt-qemu-machine-type-fixes1.patch
+++ b/libvirt-qemu-machine-type-fixes1.patch
@@ -0,0 +1,177 @@
+From d7722ed1cb04aa8a7b9fbf880882841867b69ab0 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Mon, 12 Oct 2009 10:52:13 +0100
+Subject: [PATCH] Take domain type into account when looking up default machine
+
+If one has e.g.
+
+  <guest>
+    <os_type>hvm</os_type>
+    <arch name='x86_64'>
+      <wordsize>64</wordsize>
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
+      <machine>pc-0.11</machine>
+      <machine canonical='pc-0.11'>pc</machine>
+      <machine>pc-0.10</machine>
+      <machine>isapc</machine>
+      <domain type='qemu'>
+      </domain>
+      <domain type='kvm'>
+        <emulator>/usr/bin/kvm</emulator>
+        <machine>pc</machine>
+        <machine>isapc</machine>
+      </domain>
+    </arch>
+  </guest>
+
+and start a guest with:
+
+  <domain type='kvm'>
+    ...
+    <os>
+      <type arch='x86_64'>hvm</type>
+      ...
+    </os>
+  </domain>
+
+then the default machine type should be 'pc' and not 'pc-0.11'
+
+Issue was reported by Anton Protopopov.
+
+* src/capabilities.[ch]: pass the domain type to
+  virCapabilitiesDefaultGuestArch() and use it to look up the default
+  machine type from a specific guest domain if needed.
+
+* src/conf/domain_conf.c, src/xen/xm_internal.c: update
+
+* tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml: update
+  the domain type to 'kvm' and remove the machine type to check
+  that the default gets looked up correctly
+
+(cherry picked from commit 73c901a8075c09203545fc81164c1e5f11c67c89)
+
+Fedora-patch: libvirt-qemu-machine-type-fixes1.patch
+---
+ src/capabilities.c                                 |   31 ++++++++++++++++---
+ src/capabilities.h                                 |    3 +-
+ src/domain_conf.c                                  |    3 +-
+ src/xm_internal.c                                  |    3 +-
+ .../qemuxml2argv-machine-aliases2.xml              |    4 +-
+ 5 files changed, 34 insertions(+), 10 deletions(-)
+
+diff --git a/src/capabilities.c b/src/capabilities.c
+index 38fe7fc..6ebddf5 100644
+--- a/src/capabilities.c
+++ b/src/capabilities.c
+@@ -549,22 +549,43 @@ virCapabilitiesDefaultGuestArch(virCapsPtr caps,
+  * @caps: capabilities to query
+  * @ostype: OS type to search for
+  * @arch: architecture to search for
+ * @domain: domain type to search for
+  *
+  * Returns the first machine variant associated with
+- * the requested operating system type and architecture
+ * the requested operating system type, architecture
+ * and domain type
+  */
+ extern const char *
+ virCapabilitiesDefaultGuestMachine(virCapsPtr caps,
+                                    const char *ostype,
+-                                   const char *arch)
+                                   const char *arch,
+                                   const char *domain)
+ {
+     int i;
+
+     for (i = 0 ; i < caps->nguests ; i++) {
+-        if (STREQ(caps->guests[i]->ostype, ostype) &&
+-            STREQ(caps->guests[i]->arch.name, arch) &&
+-            caps->guests[i]->arch.defaultInfo.nmachines)
+        virCapsGuestPtr guest = caps->guests[i];
+        int j;
+
+        if (!STREQ(guest->ostype, ostype) || !STREQ(guest->arch.name, arch))
+            continue;
+
+        for (j = 0; j < guest->arch.ndomains; j++) {
+            virCapsGuestDomainPtr dom= guest->arch.domains[j];
+
+            if (!STREQ(dom->type, domain))
+                continue;
+
+            if (!dom->info.nmachines)
+                break;
+
+            return dom->info.machines[0]->name;
+        }
+
+        if (guest->arch.defaultInfo.nmachines)
+             return caps->guests[i]->arch.defaultInfo.machines[0]->name;
+     }
+
+     return NULL;
+ }
+ 
+diff --git a/src/capabilities.h b/src/capabilities.h
+index b958d95..2f24605 100644
+--- a/src/capabilities.h
+++ b/src/capabilities.h
+@@ -207,7 +207,8 @@ virCapabilitiesDefaultGuestArch(virCapsPtr caps,
+ extern const char *
+ virCapabilitiesDefaultGuestMachine(virCapsPtr caps,
+                                    const char *ostype,
+-                                   const char *arch);
+                                   const char *arch,
+                                   const char *domain);
+ extern const char *
+ virCapabilitiesDefaultGuestEmulator(virCapsPtr caps,
+                                     const char *ostype,
+diff --git a/src/domain_conf.c b/src/domain_conf.c
+index 5ae0775..c424c67 100644
+--- a/src/domain_conf.c
+++ b/src/domain_conf.c
+@@ -2664,7 +2664,8 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn,
+     if (!def->os.machine) {
+         const char *defaultMachine = virCapabilitiesDefaultGuestMachine(caps,
+                                                                         def->os.type,
+-                                                                        def->os.arch);
+                                                                        def->os.arch,
+                                                                        virDomainVirtTypeToString(def->virtType));
+         if (defaultMachine != NULL) {
+             if (!(def->os.machine = strdup(defaultMachine))) {
+                 virReportOOMError(conn);
+diff --git a/src/xm_internal.c b/src/xm_internal.c
+index de3aca9..6d351d4 100644
+--- a/src/xm_internal.c
+++ b/src/xm_internal.c
+@@ -720,7 +720,8 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
+ 
+     defaultMachine = virCapabilitiesDefaultGuestMachine(priv->caps,
+                                                         def->os.type,
+-                                                        def->os.arch);
+                                                        def->os.arch,
+                                                        virDomainVirtTypeToString(def->virtType));
+     if (defaultMachine != NULL) {
+         if (!(def->os.machine = strdup(defaultMachine)))
+             goto no_memory;
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
+index 6f62243..a2c6254 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml
+@@ -1,11 +1,11 @@
+-<domain type='qemu'>
+<domain type='kvm'>
+   <name>QEMUGuest1</name>
+   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+   <memory>219200</memory>
+   <currentMemory>219200</currentMemory>
+   <vcpu>1</vcpu>
+   <os>
+-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64'>hvm</type>
+     <boot dev='hd'/>
+   </os>
+   <clock offset='utc'/>
+-- 
+1.6.2.5
+
--- a/libvirt-qemu-machine-type-fixes2.patch
+++ b/libvirt-qemu-machine-type-fixes2.patch
@@ -0,0 +1,42 @@
+From bb64cc4cbe5d3c69057f63be2c1acaca72038e5a Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 15 Oct 2009 12:09:17 +0100
+Subject: [PATCH] Don't copy old machines from a domain which has none
+
+If the the qemu and kvm binaries are the same, we don't include machine
+types in the kvm domain info.
+
+However, the code which refreshes the machine types info from the
+previous capabilities structure first looks at the kvm domain's info,
+finds it matches and then copies the empty machine types list over
+for the top-level qemu domain.
+
+That doesn't make sense, we shouldn't copy an empty machin types list.
+
+* src/qemu/qemu_conf.c: qemudGetOldMachinesFromInfo(): don't copy an
+  empty machine types list.
+
+(cherry picked from commit 2210f8a3a8e2774ca4fb8b42e21899e5b85ca913)
+
+Fedora-patch: libvirt-qemu-machine-type-fixes2.patch
+---
+ src/qemu_conf.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 0dd0624..34a7fe1 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -505,6 +505,9 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info,
+     virCapsGuestMachinePtr *list;
+     int i;
+ 
+    if (!info->nmachines)
+        return 0;
+
+     if (!info->emulator || !STREQ(emulator, info->emulator))
+         return 0;
+ 
+-- 
+1.6.2.5
+
--- a/libvirt-storage-iscsi-auth-xml-formatting.patch
+++ b/libvirt-storage-iscsi-auth-xml-formatting.patch
@@ -0,0 +1,30 @@
+From a44bce591a8d746a4a00c8609cb0111c76271cab Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Thu, 8 Oct 2009 18:05:36 -0400
+Subject: [PATCH] storage: Fix generating iscsi 'auth' xml
+
+We were missing a closing tag, so the XML wasn't proper.
+
+(cherry picked from commit 826cbac4591fd5929b497299a90d3a65226b2825)
+
+Fedora-patch: libvirt-storage-iscsi-auth-xml-formatting.patch
+---
+ src/storage_conf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/storage_conf.c b/src/storage_conf.c
+index 788de15..1633aac 100644
+--- a/src/storage_conf.c
+++ b/src/storage_conf.c
+@@ -799,7 +799,7 @@ virStoragePoolSourceFormat(virConnectPtr conn,
+ 
+ 
+     if (src->authType == VIR_STORAGE_POOL_AUTH_CHAP)
+-        virBufferVSprintf(buf,"    <auth type='chap' login='%s' passwd='%s'>\n",
+        virBufferVSprintf(buf,"    <auth type='chap' login='%s' passwd='%s'/>\n",
+                           src->auth.chap.login,
+                           src->auth.chap.passwd);
+     virBufferAddLit(buf,"  </source>\n");
+-- 
+1.6.2.5
+
--- a/libvirt-svirt-relabel-qcow2-backing-files.patch
+++ b/libvirt-svirt-relabel-qcow2-backing-files.patch
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -53,14 +53,12 @@
 %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}}
 %define with_numactl       0%{!?_without_numactl:%{server_drivers}}
 %define with_selinux       0%{!?_without_selinux:%{server_drivers}}
+%define with_hal           0%{!?_without_hal:%{server_drivers}}

 # A few optional bits off by default, we enable later
 %define with_polkit        0%{!?_without_polkit:0}
 %define with_capng         0%{!?_without_capng:0}
 %define with_netcf         0%{!?_without_netcf:0}
-%define with_udev          0%{!?_without_udev:0}
-%define with_hal           0%{!?_without_hal:0}
-%define with_yajl          0%{!?_without_yajl:0}

 # Non-server/HV driver defaults which are always enabled
 %define with_python        0%{!?_without_python:1}
@@ -74,10 +72,6 @@
 %define with_xen 0
 %endif

-# Numactl is not available on s390[x]
-%ifarch s390 s390x
-%define with_numactl 0
-%endif

 # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX
 %if 0%{?rhel}
@@ -135,18 +129,6 @@
 %define with_netcf     0%{!?_without_netcf:%{server_drivers}}
 %endif

-# udev is used to manage host devices in Fedora 12 / RHEL-6 or newer
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
-%define with_udev     0%{!?_without_udev:%{server_drivers}}
-%else
-%define with_hal       0%{!?_without_hal:%{server_drivers}}
-%endif
-
-# Enable yajl library for JSON mode with QEMU
-%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
-%define with_yajl     0%{!?_without_yajl:%{server_drivers}}
-%endif
-
 # Force QEMU to run as non-root
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %define qemu_user  qemu
@@ -168,27 +150,55 @@

 Summary: Library providing a simple API virtualization
 Name: libvirt
-Version: 0.7.7
-Release: 4%{?dist}%{?extra_release}
+Version: 0.7.1
+Release: 13%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
-# Fix USB devices by product with security enabled (bz 574136)
-Patch1: %{name}-%{version}-fix-usb-product.patch
-# Set kernel/initrd in security driver, fixes some URL installs (bz 566425)
-Patch2: %{name}-%{version}-set-kernel-perms.patch
-# Fix slow storage volume allocation (bz 582356)
-Patch3: %{name}-%{version}-fix-slow-dsync.patch
-# Fix nodedev XML conversion errors (bz 591262)
-Patch4: %{name}-%{version}-nodedev-conversions.patch
-# Fix PCI xml decimal parsing (bz 582752)
-Patch5: %{name}-%{version}-pci-decimal-parsing.patch
-# Fix CDROM media connect/eject (bz 582005)
-Patch6: %{name}-%{version}-fix-cdrom-change.patch
-# Always report qemu startup output on error (bz 581381)
-Patch7: %{name}-%{version}-qemu-startup-output.patch
-# Fix crash from 'virsh dominfo' if secdriver disabled (bz 581166)
-Patch8: %{name}-%{version}-no-secdriver-crash.patch
+
+# A couple of hot-unplug memory handling fixes (#523953)
+Patch01: libvirt-fix-net-hotunplug-double-free.patch
+Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
+
+# Don't set a bogus error in virDrvSupportsFeature()
+Patch03: libvirt-fix-drv-supports-feature-bogus-error.patch
+
+# Fix raw save format
+Patch04: libvirt-fix-qemu-raw-format-save.patch
+
+# Fix USB device passthrough (#422683)
+Patch05: libvirt-fix-usb-device-passthrough.patch
+
+# Disable sound backend (#524499, #508317)
+Patch06: libvirt-disable-audio-backend.patch
+
+# Re-label qcow2 backing files (#497131)
+Patch07: libvirt-svirt-relabel-qcow2-backing-files.patch
+
+# Change logrotate config to weekly (#526769)
+Patch08: libvirt-change-logrotate-config-to-weekly.patch
+Patch09: libvirt-logrotate-create-lxc-uml-dirs.patch
+
+# Add several PCI hot-unplug typo fixes from upstream
+Patch10: libvirt-fix-device-detach-typo1.patch
+Patch11: libvirt-fix-device-detach-typo2.patch
+Patch12: libvirt-fix-device-detach-typo3.patch
+
+# Fix libvirtd memory leak during error reply sending (#528162)
+Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
+
+# Fix restore of qemu guest using raw save format (#523158)
+Patch14: libvirt-fix-qemu-restore-from-raw1.patch
+Patch15: libvirt-fix-qemu-restore-from-raw2.patch
+
+# Misc fixes to qemu machine types handling
+Patch16: libvirt-qemu-machine-type-fixes1.patch
+Patch17: libvirt-qemu-machine-type-fixes2.patch
+
+# A couple of XML formatting fixes
+Patch18: libvirt-storage-iscsi-auth-xml-formatting.patch
+Patch19: libvirt-network-delay-attribute-formatting.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -209,9 +219,6 @@ Requires: iptables
 %if %{with_hal}
 Requires: hal
 %endif
-%if %{with_udev}
-Requires: udev >= 145
-%endif
 %if %{with_polkit}
 %if 0%{?fedora} >= 12 || 0%{?rhel} >=6
 Requires: polkit >= 0.93
@@ -264,7 +271,7 @@ Requires: device-mapper
 BuildRequires: xen-devel
 %endif
 %if %{with_one}
-BuildRequires: xmlrpc-c-devel >= 1.14.0 xmlrpc-c-client
+BuildRequires: xmlrpc-c-devel >= 1.14.0
 %endif
 BuildRequires: libxml2-devel
 BuildRequires: xhtml1-dtds
@@ -275,13 +282,6 @@ BuildRequires: gnutls-devel
 %if %{with_hal}
 BuildRequires: hal-devel
 %endif
-%if %{with_udev}
-BuildRequires: libudev-devel >= 145
-BuildRequires: libpciaccess-devel >= 0.10.9
-%endif
-%if %{with_yajl}
-BuildRequires: yajl-devel
-%endif
 %if %{with_avahi}
 BuildRequires: avahi-devel
 %endif
@@ -352,12 +352,15 @@ BuildRequires: libcap-ng-devel >= 0.5.0
 BuildRequires: libssh2-devel
 %endif
 %if %{with_netcf}
-BuildRequires: netcf-devel >= 0.1.4
+BuildRequires: netcf-devel
 %endif

 # Fedora build root suckage
 BuildRequires: gawk

+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+BuildRequires: automake
+
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -385,7 +388,7 @@ virtualization capabilities of recent versions of Linux (and other OSes).
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
-Requires: libvirt-client = %{version}-%{release}
+Requires: libvirt = %{version}-%{release}
 Requires: pkgconfig
 %if %{with_xen}
 Requires: xen-devel
@@ -410,16 +413,31 @@ of recent versions of Linux (and other OSes).

 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+
+%patch01 -p1
+%patch02 -p1
+%patch03 -p1
+%patch04 -p1
+%patch05 -p1
+%patch06 -p1
+%patch07 -p1
+%patch08 -p1
+%patch09 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1

 %build
+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+automake
+
 %if ! %{with_xen}
 %define _without_xen --without-xen
 %endif
@@ -524,14 +542,6 @@ of recent versions of Linux (and other OSes).
 %define _without_hal --without-hal
 %endif

-%if ! %{with_udev}
-%define _without_udev --without-udev
-%endif
-
-%if ! %{with_yajl}
-%define _without_yajl --without-yajl
-%endif
-
 %configure %{?_without_xen} \
           %{?_without_qemu} \
           %{?_without_openvz} \
@@ -558,8 +568,6 @@ of recent versions of Linux (and other OSes).
           %{?_without_netcf} \
           %{?_without_selinux} \
           %{?_without_hal} \
-           %{?_without_udev} \
-           %{?_without_yajl} \
           --with-qemu-user=%{qemu_user} \
           --with-qemu-group=%{qemu_group} \
           --with-init-script=redhat \
@@ -571,10 +579,10 @@ gzip -9 ChangeLog
 rm -fr %{buildroot}

 %makeinstall
-for i in domain-events/events-c dominfo domsuspend hellolibvirt python
-do
-  (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
-done
+(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
+(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in)
+(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
+(cd examples/domain-events/events-c ;  make clean ;rm -rf .deps .libs Makefile Makefile.in)
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la
@@ -601,11 +609,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif
 %find_lang %{name}

-%if ! %{with_lxc}
-rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
-rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-%endif
-
 %if ! %{with_python}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
 %endif
@@ -617,9 +620,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version}
 %if ! %{with_qemu}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
 %endif
-%if ! %{with_lxc}
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf
-%endif

 %if %{with_libvirtd}
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd
@@ -700,9 +700,6 @@ fi
 %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %endif
-%if %{with_lxc}
-%config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
-%endif

 %dir %{_datadir}/libvirt/

@@ -734,6 +731,9 @@ fi
 %if %{with_network}
 %dir %{_localstatedir}/run/libvirt/network/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/
 %endif

 %if %{with_qemu}
@@ -741,11 +741,6 @@ fi
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
 %endif

-%if %{with_lxc}
-%{_datadir}/augeas/lenses/libvirtd_lxc.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-%endif
-
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug

@@ -779,10 +774,8 @@ fi

 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-xml-validate.1*
-%{_mandir}/man1/virt-pki-validate.1*
 %{_bindir}/virsh
 %{_bindir}/virt-xml-validate
-%{_bindir}/virt-pki-validate
 %{_libdir}/lib*.so.*

 %dir %{_datadir}/libvirt/
@@ -798,8 +791,6 @@ fi
 %{_datadir}/libvirt/schemas/secret.rng
 %{_datadir}/libvirt/schemas/storageencryption.rng

-%{_datadir}/libvirt/cpu_map.xml
-
 %if %{with_sasl}
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %endif
@@ -818,12 +809,9 @@ fi
 %doc %{_datadir}/gtk-doc/html/libvirt/*.css

 %doc docs/*.html docs/html docs/*.gif
+%doc docs/examples
 %doc docs/libvirt-api.xml
-%doc examples/hellolibvirt
-%doc examples/domain-events/events-c
-%doc examples/dominfo
-%doc examples/domsuspend
-%doc examples/xml
+%doc examples

 %if %{with_python}
 %files python
@@ -834,89 +822,14 @@ fi
 %{_libdir}/python*/site-packages/libvirtmod*
 %doc python/tests/*.py
 %doc python/TODO
-%doc examples/python
-%doc examples/domain-events/events-python
+%doc python/libvirtclass.txt
+%doc docs/examples/python
 %endif

 %changelog
-* Tue May 18 2010 Cole Robinson <crobinso@redhat.com> - 0.7.7-4.fc13
- Fix nodedev XML conversion errors (bz 591262)
- Fix PCI xml decimal parsing (bz 582752)
- Fix CDROM media connect/eject (bz 582005)
- Always report qemu startup output on error (bz 581381)
- Fix crash from 'virsh dominfo' if secdriver disabled (bz 581166)
-
-* Tue Apr 20 2010 Cole Robinson <crobinso@redhat.com> - 0.7.7-3.fc13
- Fix slow storage volume allocation (bz 582356)
-
-* Mon Mar 22 2010 Cole Robinson <crobinso@redhat.com> - 0.7.7-2.fc13
- Fix USB devices by product with security enabled (bz 574136)
- Set kernel/initrd in security driver, fixes some URL installs (bz 566425)
-
-* Fri Mar  5 2010 Daniel Veillard <veillard@redhat.com> - 0.7.7-1
- macvtap support
- async job handling
- virtio channel
- computing baseline CPU
- virDomain{Attach,Detach}DeviceFlags
- assorted bug fixes and lots of cleanups
-
-* Tue Feb 16 2010 Adam Jackson <ajax@redhat.com> 0.7.6-2
- libvirt-0.7.6-add-needed.patch: Fix FTBFS from --no-add-needed
- Add BuildRequires: xmlrpc-c-client for libxmlrpc_client.so
-
-* Wed Feb  3 2010 Daniel Veillard <veillard@redhat.com> - 0.7.6-1
- upstream release of 0.7.6
- Use QEmu new device adressing when possible
- Implement CPU topology support for QEMU driver
- Implement SCSI controller hotplug/unplug for QEMU
- Implement support for multi IQN
- a lot of fixes and improvements
-
-* Thu Jan 14 2010 Chris Weyl <cweyl@alumni.drew.edu> 0.7.5-3
- bump for libssh2 rebuild
-
-* Tue Jan 12 2010 Daniel P. Berrange <berrange@redhat.com> - 0.7.5-2
- Rebuild for libparted soname change
-
-* Wed Dec 23 2009 Daniel Veillard <veillard@redhat.com> - 0.7.5-1
- Add new API virDomainMemoryStats
- Public API and domain extension for CPU flags
- vbox: Add support for version 3.1
- Support QEMU's virtual FAT block device driver
- a lot of fixes
-
-* Fri Nov 20 2009 Daniel Veillard <veillard@redhat.com> - 0.7.4-1
- upstream release of 0.7.4
- udev node device backend
- API to check object properties
- better QEmu monitor processing
- MAC address based port filtering for qemu
- support IPv6 and multiple addresses per interfaces
- a lot of fixes
-
-* Thu Nov 19 2009 Daniel P. Berrange <berrange@redhat.com> - 0.7.2-6
- Really fix restore file labelling this time
-
-* Wed Nov 11 2009 Daniel P. Berrange <berrange@redhat.com> - 0.7.2-5
- Disable numactl on s390[x]. Again.
-
-* Wed Nov 11 2009 Daniel P. Berrange <berrange@redhat.com> - 0.7.2-4
- Fix QEMU save/restore permissions / labelling
-
-* Thu Oct 29 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.2-3
- Avoid compressing small log files (#531030)
-
-* Thu Oct 29 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.2-2
- Make libvirt-devel require libvirt-client, not libvirt
- Fix qemu machine types handling
-
-* Wed Oct 14 2009 Daniel Veillard <veillard@redhat.com> - 0.7.2-1
- Upstream release of 0.7.2
- Allow to define ESX domains
- Allows suspend and resulme of LXC domains
- API for data streams
- many bug fixes
+* Mon Oct 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-13
+- Misc fixes to qemu machine types handling
+- A couple of XML formatting fixes

 * Tue Oct 13 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-12
 - Fix restore of qemu guest using raw save format (#523158)
--- a/2
+++ b/2
@@ -1 +1 @@
-5f315b0bf20e3964f7657ba1e630cd67  libvirt-0.7.7.tar.gz
+f1cd360a5da38b847e166c6482141940  libvirt-0.7.1.tar.gz
Author	SHA1	Message	Date
Mark McLoughlin	7d9775ba12	* Mon Oct 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-13 - Misc fixes to qemu machine types handling - A couple of XML formatting fixes	2009-10-19 10:14:07 +00:00
Mark McLoughlin	3cfccddffa	Add the second patch for #523158	2009-10-13 15:43:51 +00:00
Mark McLoughlin	1bc3776fdb	* Tue Oct 13 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-12 - Fix restore of qemu guest using raw save format (#523158)	2009-10-13 15:34:19 +00:00
Mark McLoughlin	3a44160f46	* Fri Oct 9 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-11 - Fix libvirtd memory leak during error reply sending (#528162) - Add several PCI hot-unplug typo fixes from upstream	2009-10-09 14:55:28 +00:00
Mark McLoughlin	5e8ea6c64c	* Tue Oct 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-10 - Create /var/log/libvirt/{lxc,uml} dirs for logrotate - Make libvirt-python dependon on libvirt-client - Sync misc minor changes from upstream spec	2009-10-06 12:42:16 +00:00
Mark McLoughlin	00ce651fb8	* Tue Oct 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-9 - Change logrotate config to weekly (#526769)	2009-10-06 09:43:52 +00:00
Mark McLoughlin	3c684a55ed	- Re-label qcow2 backing files (#497131 )	2009-10-01 15:17:32 +00:00
Mark McLoughlin	b1ea570e48	* Thu Oct 1 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-8 - Disable sound backend, even when selinux is disabled (#524499)	2009-10-01 08:35:16 +00:00
Mark McLoughlin	6ccf4c1a0c	* Wed Sep 30 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-7 - Fix USB device passthrough (#522683)	2009-09-30 17:57:50 +00:00
Jesse Keating	dbaa6786af	Initialize branch F-12 for libvirt	2009-09-29 05:24:04 +00:00