Disable -Werror on mingw builds

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

.abignore

@@ -0,0 +1,31 @@
+[suppress_function]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_function]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*

.cvsignore

@@ -1,13 +0,0 @@
-.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

.gitignore

@@ -0,0 +1,5 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.xz

0001-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch

@@ -0,0 +1,40 @@
+From 76cdc7adf55723ff8da146bd3c15c64d0afd5d93 Mon Sep 17 00:00:00 2001
+From: Martin Kletzander <mkletzan@redhat.com>
+Date: Tue, 27 Feb 2024 16:20:12 +0100
+Subject: [PATCH] Fix off-by-one error in udevListInterfacesByStatus
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ever since this function was introduced in 2012 it could've tried
+filling in an extra interface name.  That was made worse in 2019 when
+the caller functions started accepting NULL arrays of size 0.
+
+This is assigned CVE-2024-1441.
+
+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+Reported-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
+Fixes: 5a33366f5c0b18c93d161bd144f9f079de4ac8ca
+Fixes: d6064e2759a24e0802f363e3a810dc5a7d7ebb15
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c664015fe3a7bf59db26686e9ed69af011c6ebb8)
+---
+ src/interface/interface_backend_udev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index fb6799ed94..4091483060 100644
+--- a/src/interface/interface_backend_udev.c
++++ b/src/interface/interface_backend_udev.c
+@@ -222,7 +222,7 @@ udevListInterfacesByStatus(virConnectPtr conn,
+         g_autoptr(virInterfaceDef) def = NULL;
+ 
+         /* Ensure we won't exceed the size of our array */
+-        if (count > names_len)
++        if (count >= names_len)
+             break;
+ 
+         path = udev_list_entry_get_name(dev_entry);
+-- 
+2.43.0
+

0001-interface-fix-udev-reference-leak-with-invalid-flags.patch

@@ -0,0 +1,41 @@
+From 3499354e12a1c1832bf4030693a64e03ceb79d05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 5 Jun 2024 11:16:21 +0100
+Subject: [PATCH] interface: fix udev reference leak with invalid flags
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The udevInterfaceGetXMLDesc method takes a reference on the udev
+driver as its first action. If the virCheckFlags() condition
+fails, however, this reference is never released.
+
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/interface/interface_backend_udev.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index fdf11a8318..e1a50389c9 100644
+--- a/src/interface/interface_backend_udev.c
++++ b/src/interface/interface_backend_udev.c
+@@ -1027,12 +1027,14 @@ static char *
+ udevInterfaceGetXMLDesc(virInterfacePtr ifinfo,
+                         unsigned int flags)
+ {
+-    struct udev *udev = udev_ref(driver->udev);
++    struct udev *udev = NULL;
+     g_autoptr(virInterfaceDef) ifacedef = NULL;
+     char *xmlstr = NULL;
+ 
+     virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL);
+ 
++    udev = udev_ref(driver->udev);
++
+     /* Recursively build up the interface XML based on the requested
+      * interface name
+      */
+-- 
+2.45.1
+

0001-interface-fix-udev_device_get_sysattr_value-return-v.patch

@@ -0,0 +1,90 @@
+From c120b31f826cd51127d28f8beaa61ac0d5f03048 Mon Sep 17 00:00:00 2001
+From: Dmitry Frolov <frolov@swemel.ru>
+Date: Tue, 12 Sep 2023 15:56:47 +0300
+Subject: [PATCH] interface: fix udev_device_get_sysattr_value return value
+ check
+
+Reviewing the code I found that return value of function
+udev_device_get_sysattr_value() is dereferenced without a check.
+udev_device_get_sysattr_value() may return NULL by number of reasons.
+
+v2: VIR_DEBUG added, replaced STREQ(NULLSTR()) with STREQ_NULLABLE()
+v3: More checks added, to skip earlier. More verbose VIR_DEBUG.
+
+Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
+Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
+(cherry picked from commit 2ca94317ac642a70921947150ced8acc674ccdc8)
+---
+ src/interface/interface_backend_udev.c | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index a0485ddd21..fb6799ed94 100644
+--- a/src/interface/interface_backend_udev.c
++++ b/src/interface/interface_backend_udev.c
+@@ -23,6 +23,7 @@
+ #include <dirent.h>
+ #include <libudev.h>
+ 
++#include "virlog.h"
+ #include "virerror.h"
+ #include "virfile.h"
+ #include "datatypes.h"
+@@ -40,6 +41,8 @@
+ 
+ #define VIR_FROM_THIS VIR_FROM_INTERFACE
+ 
++VIR_LOG_INIT("interface.interface_backend_udev");
++
+ struct udev_iface_driver {
+     struct udev *udev;
+     /* pid file FD, ensures two copies of the driver can't use the same root */
+@@ -354,11 +357,20 @@ udevConnectListAllInterfaces(virConnectPtr conn,
+         const char *macaddr;
+         g_autoptr(virInterfaceDef) def = NULL;
+ 
+-        path = udev_list_entry_get_name(dev_entry);
+-        dev = udev_device_new_from_syspath(udev, path);
+-        name = udev_device_get_sysname(dev);
++        if (!(path = udev_list_entry_get_name(dev_entry))) {
++            VIR_DEBUG("Skipping interface, path == NULL");
++            continue;
++        }
++        if (!(dev = udev_device_new_from_syspath(udev, path))) {
++            VIR_DEBUG("Skipping interface '%s', dev == NULL", path);
++            continue;
++        }
++        if (!(name = udev_device_get_sysname(dev))) {
++            VIR_DEBUG("Skipping interface '%s', name == NULL", path);
++            continue;
++        }
+         macaddr = udev_device_get_sysattr_value(dev, "address");
+-        status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
++        status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
+ 
+         def = udevGetMinimalDefForDevice(dev);
+         if (!virConnectListAllInterfacesCheckACL(conn, def)) {
+@@ -964,9 +976,9 @@ udevGetIfaceDef(struct udev *udev, const char *name)
+ 
+     /* MTU */
+     mtu_str = udev_device_get_sysattr_value(dev, "mtu");
+-    if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
++    if (!mtu_str || virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+-                _("Could not parse MTU value '%1$s'"), mtu_str);
++                _("Could not parse MTU value '%1$s'"), NULLSTR(mtu_str));
+         goto error;
+     }
+     ifacedef->mtu = mtu;
+@@ -1089,7 +1101,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo)
+        goto cleanup;
+ 
+     /* Check if it's active or not */
+-    status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
++    status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
+ 
+     udev_device_unref(dev);
+ 
+-- 
+2.43.0
+

0001-rpc-avoid-leak-of-GSource-in-use-for-interrupting-ma.patch

@@ -0,0 +1,49 @@
+From 98f1cf88fa7e0f992d93f376418fbfb3996a9690 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Fri, 17 May 2024 14:55:24 +0100
+Subject: [PATCH] rpc: avoid leak of GSource in use for interrupting main loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We never release the reference on the GSource created for
+interrupting the main loop, nor do we remove it from the
+main context if our thread is woken up prior to the wakeup
+callback firing.
+
+This can result in a leak of GSource objects, along with an
+ever growing list of GSources attached to the main context,
+which will gradually slow down execution of the loop, as
+several operations are O(N) for the number of attached GSource
+objects.
+
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/rpc/virnetclient.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 147b0d661a..6d424eb599 100644
+--- a/src/rpc/virnetclient.c
++++ b/src/rpc/virnetclient.c
+@@ -1946,7 +1946,7 @@ static int virNetClientIO(virNetClient *client,
+     /* Check to see if another thread is dispatching */
+     if (client->haveTheBuck) {
+         /* Force other thread to wakeup from poll */
+-        GSource *wakeup = g_idle_source_new();
++        g_autoptr(GSource) wakeup = g_idle_source_new();
+         g_source_set_callback(wakeup, virNetClientIOWakeup, client->eventLoop, NULL);
+         g_source_attach(wakeup, client->eventCtx);
+ 
+@@ -1968,6 +1968,7 @@ static int virNetClientIO(virNetClient *client,
+             return -1;
+         }
+ 
++        g_source_destroy(wakeup);
+         VIR_DEBUG("Woken up from sleep head=%p call=%p",
+                   client->waitDispatch, thiscall);
+         /* Three reasons we can be woken up
+-- 
+2.45.1
+

0001-rpc-ensure-temporary-GSource-is-removed-from-client-.patch

@@ -0,0 +1,99 @@
+From 8074d64dc2eca846d6a61efe1a9b7428a0ce1dd1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 30 Apr 2024 11:51:15 +0100
+Subject: [PATCH] rpc: ensure temporary GSource is removed from client event
+ loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Users are seeing periodic segfaults from libvirt client apps,
+especially thread heavy ones like virt-manager. A typical
+stack trace would end up in the virNetClientIOEventFD method,
+with illegal access to stale stack data. eg
+
+==238721==ERROR: AddressSanitizer: stack-use-after-return on address 0x75cd18709788 at pc 0x75cd3111f907 bp 0x75cd181ff550 sp 0x75cd181ff548
+WRITE of size 4 at 0x75cd18709788 thread T11
+    #0 0x75cd3111f906 in virNetClientIOEventFD /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:1634:15
+    #1 0x75cd3210d198  (/usr/lib/libglib-2.0.so.0+0x5a198) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #2 0x75cd3216c3be  (/usr/lib/libglib-2.0.so.0+0xb93be) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #3 0x75cd3210ddc6 in g_main_loop_run (/usr/lib/libglib-2.0.so.0+0x5adc6) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #4 0x75cd3111a47c in virNetClientIOEventLoop /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:1722:9
+    #5 0x75cd3111a47c in virNetClientIO /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2002:10
+    #6 0x75cd3111a47c in virNetClientSendInternal /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2170:11
+    #7 0x75cd311198a8 in virNetClientSendWithReply /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2198:11
+    #8 0x75cd31111653 in virNetClientProgramCall /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclientprogram.c:318:9
+    #9 0x75cd31241c8f in callFull /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/remote/remote_driver.c:6054:10
+    #10 0x75cd31241c8f in call /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/remote/remote_driver.c:6076:12
+    #11 0x75cd31241c8f in remoteNetworkGetXMLDesc /usr/src/debug/libvirt/libvirt-10.2.0/build/src/remote/remote_client_bodies.h:5959:9
+    #12 0x75cd31410ff7 in virNetworkGetXMLDesc /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/libvirt-network.c:952:15
+
+The root cause is a bad assumption in the virNetClientIOEventLoop
+method. This method is run by whichever thread currently owns the
+buck, and is responsible for handling I/O. Inside a for(;;) loop,
+this method creates a temporary GSource, adds it to the event loop
+and runs g_main_loop_run(). When I/O is ready, the GSource callback
+(virNetClientIOEventFD) will fire and call g_main_loop_quit(), and
+return G_SOURCE_REMOVE which results in the temporary GSource being
+destroyed. A g_autoptr() will then remove the last reference.
+
+What was overlooked, is that a second thread can come along and
+while it can't enter virNetClientIOEventLoop, it will register an
+idle source that uses virNetClientIOWakeup to interrupt the
+original thread's 'g_main_loop_run' call. When this happens the
+virNetClientIOEventFD callback never runs, and so the temporary
+GSource is not destroyed. The g_autoptr() will remove a reference,
+but by virtue of still being attached to the event context, there
+is an extra reference held causing GSource to be leaked. The
+next time 'g_main_loop_run' is called, the original GSource will
+trigger its callback, and access data that was allocated on the
+stack by the previous thread, and likely SEGV.
+
+To solve this, the thread calling 'g_main_loop_run' must call
+g_source_destroy, immediately upon return, to guarantee that
+the temporary GSource is removed.
+
+CVE-2024-4418
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reported-by: Martin Shirokov <shirokovmartin@gmail.com>
+Tested-by: Martin Shirokov <shirokovmartin@gmail.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/rpc/virnetclient.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 68098b1c8d..147b0d661a 100644
+--- a/src/rpc/virnetclient.c
++++ b/src/rpc/virnetclient.c
+@@ -1657,7 +1657,7 @@ static int virNetClientIOEventLoop(virNetClient *client,
+ #endif /* !WIN32 */
+         int timeout = -1;
+         virNetMessage *msg = NULL;
+-        g_autoptr(GSource) G_GNUC_UNUSED source = NULL;
++        g_autoptr(GSource) source = NULL;
+         GIOCondition ev = 0;
+         struct virNetClientIOEventData data = {
+             .client = client,
+@@ -1721,6 +1721,18 @@ static int virNetClientIOEventLoop(virNetClient *client,
+ 
+         g_main_loop_run(client->eventLoop);
+ 
++        /*
++         * If virNetClientIOEventFD ran, this GSource will already be
++         * destroyed due to G_SOURCE_REMOVE. It is harmless to re-destroy
++         * it, since we still own a reference.
++         *
++         * If virNetClientIOWakeup ran, it will have interrupted the
++         * g_main_loop_run call, before virNetClientIOEventFD could
++         * run, and thus the GSource is still registered, and we need
++         * to destroy it since it is referencing stack memory for 'data'
++         */
++        g_source_destroy(source);
++
+ #ifndef WIN32
+         ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL));
+ #endif /* !WIN32 */
+-- 
+2.45.1
+

0001-rpc-fix-race-in-waking-up-client-event-loop.patch

@@ -0,0 +1,76 @@
+From 7cb03e6a28e465c49f0cabe8fe2e7d21edb5aadf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 18 Dec 2023 12:17:18 +0000
+Subject: [PATCH] rpc: fix race in waking up client event loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first thread to issue a client RPC request will own the event
+loop execution, sitting in the virNetClientIOEventLoop function.
+
+It releases the client lock while running:
+
+   virNetClientUnlock()
+   g_main_loop_run()
+   virNetClientLock()
+
+If a second thread arrives with an RPC request, it will queue it
+for the first thread to process. To inform the first thread that
+there's a new request it calls g_main_loop_quit() to break it out
+of the main loop.
+
+This works if the first thread is in g_main_loop_run() at that
+time. There is a small window of opportunity, however, where
+the first thread has released the client lock, but not yet got
+into g_main_loop_run(). If that happens, the wakeup from the
+second thread is lost.
+
+This patch deals with that by changing the way the wakeup is
+performed. Instead of directly calling g_main_loop_quit(), the
+second thread creates an idle source to run the quit function
+from within the first thread. This guarantees that the first
+thread will see the wakeup.
+
+Tested by: Fima Shevrin <efim.shevrin@virtuozzo.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Denis V. Lunev <den@openvz.org>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/rpc/virnetclient.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 4ab8af68c5..68098b1c8d 100644
+--- a/src/rpc/virnetclient.c
++++ b/src/rpc/virnetclient.c
+@@ -1848,6 +1848,15 @@ static void virNetClientIOUpdateCallback(virNetClient *client,
+ }
+ 
+ 
++static gboolean virNetClientIOWakeup(gpointer opaque)
++{
++    GMainLoop *loop = opaque;
++
++    g_main_loop_quit(loop);
++
++    return G_SOURCE_REMOVE;
++}
++
+ /*
+  * This function sends a message to remote server and awaits a reply
+  *
+@@ -1925,7 +1934,9 @@ static int virNetClientIO(virNetClient *client,
+     /* Check to see if another thread is dispatching */
+     if (client->haveTheBuck) {
+         /* Force other thread to wakeup from poll */
+-        g_main_loop_quit(client->eventLoop);
++        GSource *wakeup = g_idle_source_new();
++        g_source_set_callback(wakeup, virNetClientIOWakeup, client->eventLoop, NULL);
++        g_source_attach(wakeup, client->eventCtx);
+ 
+         /* If we are non-blocking, detach the thread and keep the call in the
+          * queue. */
+-- 
+2.43.0
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libvirt
-# $Id$
-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
-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)

branch

@@ -1 +0,0 @@
-F-12

libvirt-0.7.1-fix-selinux-save.patch

@@ -1,267 +0,0 @@
-commit bc0010b3d149df00406b82c37eb59874d8525af4
-Author: Daniel P. Berrange <berrange@redhat.com>
-Date:   Wed Nov 11 12:07:00 2009 +0000
-
-    Fix save and restore with non-privileged guests and SELinux
-    
-    When running qemu:///system instance, libvirtd runs as root,
-    but QEMU may optionally be configured to run non-root. When
-    then saving a guest to a state file, the file is initially
-    created as root, and thus QEMU cannot write to it. It is also
-    missing labelling required to allow access via SELinux.
-    
-    * src/qemu_driver.c: Set ownership on save image before
-      running migrate command in virDomainSave impl. Call out to
-      security driver to set save image labelling
-    * src/security.h: Add driver APIs for setting
-      and restoring saved state file labelling
-    * src/security_selinux.c: Implement saved state file
-      labelling for SELinux
-
-diff --git a/src/security.h b/src/security.h
-index fde2978..5514962 100644
---- a/src/security.h
-+++ b/src/security.h
-@@ -42,6 +42,11 @@ typedef int (*virSecurityDomainRestoreHostdevLabel) (virConnectPtr conn,
- typedef int (*virSecurityDomainSetHostdevLabel) (virConnectPtr conn,
-                                                  virDomainObjPtr vm,
-                                                  virDomainHostdevDefPtr dev);
-+typedef int (*virSecurityDomainSetSavedStateLabel) (virConnectPtr conn,
-+                                                    virDomainObjPtr vm,
-+                                                    const char *savefile);
-+typedef int (*virSecurityDomainRestoreSavedStateLabel) (virConnectPtr conn,
-+                                                        const char *savefile);
- typedef int (*virSecurityDomainGenLabel) (virConnectPtr conn,
-                                           virDomainObjPtr sec);
- typedef int (*virSecurityDomainReserveLabel) (virConnectPtr conn,
-@@ -71,6 +76,8 @@ struct _virSecurityDriver {
-     virSecurityDomainRestoreLabel domainRestoreSecurityLabel;
-     virSecurityDomainRestoreHostdevLabel domainRestoreSecurityHostdevLabel;
-     virSecurityDomainSetHostdevLabel domainSetSecurityHostdevLabel;
-+    virSecurityDomainSetSavedStateLabel domainSetSavedStateLabel;
-+    virSecurityDomainRestoreSavedStateLabel domainRestoreSavedStateLabel;
- 
-     /*
-      * This is internally managed driver state and should only be accessed
-diff --git a/src/security_selinux.c b/src/security_selinux.c
-index 0e31077..bd838e6 100644
---- a/src/security_selinux.c
-+++ b/src/security_selinux.c
-@@ -523,6 +523,7 @@ done:
-     return ret;
- }
- 
-+
- static int
- SELinuxRestoreSecurityPCILabel(virConnectPtr conn,
-                                pciDevice *dev ATTRIBUTE_UNUSED,
-@@ -623,6 +624,26 @@ SELinuxRestoreSecurityLabel(virConnectPtr conn,
-     return rc;
- }
- 
-+
-+static int
-+SELinuxSetSavedStateLabel(virConnectPtr conn,
-+                          virDomainObjPtr vm,
-+                          const char *savefile)
-+{
-+    const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
-+
-+    return SELinuxSetFilecon(conn, savefile, secdef->imagelabel);
-+}
-+
-+
-+static int
-+SELinuxRestoreSavedStateLabel(virConnectPtr conn,
-+                              const char *savefile)
-+{
-+    return SELinuxRestoreSecurityFileLabel(conn, savefile);
-+}
-+
-+
- static int
- SELinuxSecurityVerify(virConnectPtr conn, virDomainDefPtr def)
- {
-@@ -692,4 +713,6 @@ virSecurityDriver virSELinuxSecurityDriver = {
-     .domainSetSecurityLabel     = SELinuxSetSecurityLabel,
-     .domainSetSecurityHostdevLabel = SELinuxSetSecurityHostdevLabel,
-     .domainRestoreSecurityHostdevLabel = SELinuxRestoreSecurityHostdevLabel,
-+    .domainSetSavedStateLabel = SELinuxSetSavedStateLabel,
-+    .domainRestoreSavedStateLabel = SELinuxRestoreSavedStateLabel,
- };
-diff -rup libvirt-0.7.1/src/qemu_driver.c new/src/qemu_driver.c
---- libvirt-0.7.1/src/qemu_driver.c	2010-05-17 16:28:38.243890000 -0400
-+++ new/src/qemu_driver.c	2010-05-17 16:36:28.035091000 -0400
-@@ -3907,6 +3907,20 @@ static int qemudDomainSave(virDomainPtr 
-     }
-     fd = -1;
- 
-+    if (driver->privileged &&
-+        chown(path, driver->user, driver->group) < 0) {
-+        virReportSystemError(NULL, errno,
-+                             _("unable to set ownership of '%s' to user %d:%d"),
-+                             path, driver->user, driver->group);
-+        goto cleanup;
-+    }
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->domainSetSavedStateLabel &&
-+        driver->securityDriver->domainSetSavedStateLabel(dom->conn, vm, path) == -1)
-+        goto cleanup;
-+
-+
-     /* Migrate to file */
-     safe_path = qemudEscapeShellArg(path);
-     if (!safe_path) {
-@@ -3956,6 +3970,20 @@ static int qemudDomainSave(virDomainPtr 
-         goto cleanup;
-     }
- 
-+    if (driver->privileged &&
-+        chown(path, 0, 0) < 0) {
-+        virReportSystemError(NULL, errno,
-+                             _("unable to set ownership of '%s' to user %d:%d"),
-+                             path, 0, 0);
-+        goto cleanup;
-+    }
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->domainRestoreSavedStateLabel &&
-+        driver->securityDriver->domainRestoreSavedStateLabel(dom->conn, path) == -1)
-+        VIR_WARN("failed to restore save state label on %s", path);
-+
-+
-     /* Shut it down */
-     qemudShutdownVMDaemon(dom->conn, driver, vm);
-     event = virDomainEventNewFromObj(vm,
-diff -rup libvirt-0.7.1/src/qemu_driver.c new/src/qemu_driver.c
---- libvirt-0.7.1/src/qemu_driver.c	2010-05-17 17:55:34.000000000 -0400
-+++ new/src/qemu_driver.c	2010-05-18 11:45:29.903145000 -0400
-@@ -4028,7 +4028,7 @@ static int qemudDomainSave(virDomainPtr 
- 
-     if (driver->securityDriver &&
-         driver->securityDriver->domainRestoreSavedStateLabel &&
--        driver->securityDriver->domainRestoreSavedStateLabel(dom->conn, path) == -1)
-+        driver->securityDriver->domainRestoreSavedStateLabel(dom->conn, vm, path) == -1)
-         VIR_WARN("failed to restore save state label on %s", path);
- 
- 
-@@ -4616,6 +4616,11 @@ static int qemudDomainRestore(virConnect
-     }
-     def = NULL;
- 
-+    if (driver->securityDriver &&
-+        driver->securityDriver->domainSetSavedStateLabelRO &&
-+        driver->securityDriver->domainSetSavedStateLabelRO(conn, vm, path) == -1)
-+        goto cleanup;
-+
-     if (header.version == 2) {
-         const char *intermediate_argv[3] = { NULL, "-dc", NULL };
-         const char *prog = qemudSaveCompressionTypeToString(header.compressed);
-@@ -4651,11 +4656,6 @@ static int qemudDomainRestore(virConnect
-     close(fd);
-     fd = -1;
-     if (ret < 0) {
--        if (!vm->persistent) {
--            virDomainRemoveInactive(&driver->domains,
--                                    vm);
--            vm = NULL;
--        }
-         goto cleanup;
-     }
- 
-@@ -4677,6 +4677,19 @@ static int qemudDomainRestore(virConnect
-     ret = 0;
- 
- cleanup:
-+    if (ret < 0) {
-+        if (!vm->persistent) {
-+            virDomainRemoveInactive(&driver->domains,
-+                                    vm);
-+            vm = NULL;
-+        }
-+    }
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->domainRestoreSavedStateLabel &&
-+        driver->securityDriver->domainRestoreSavedStateLabel(conn, vm, path) == -1)
-+        VIR_WARN("Unable to restore labelling on %s", path);
-+
-     virDomainDefFree(def);
-     VIR_FREE(xml);
-     if (fd != -1)
-diff -rup libvirt-0.7.1/src/security.h new/src/security.h
---- libvirt-0.7.1/src/security.h	2010-05-17 17:55:34.000000000 -0400
-+++ new/src/security.h	2010-05-18 11:41:27.703746000 -0400
-@@ -44,7 +44,11 @@ typedef int (*virSecurityDomainSetHostde
- typedef int (*virSecurityDomainSetSavedStateLabel) (virConnectPtr conn,
-                                                     virDomainObjPtr vm,
-                                                     const char *savefile);
-+typedef int (*virSecurityDomainSetSavedStateLabelRO) (virConnectPtr conn,
-+                                                      virDomainObjPtr vm,
-+                                                      const char *savefile);
- typedef int (*virSecurityDomainRestoreSavedStateLabel) (virConnectPtr conn,
-+                                                        virDomainObjPtr vm,
-                                                         const char *savefile);
- typedef int (*virSecurityDomainGenLabel) (virConnectPtr conn,
-                                           virDomainObjPtr sec);
-@@ -76,6 +80,7 @@ struct _virSecurityDriver {
-     virSecurityDomainRestoreHostdevLabel domainRestoreSecurityHostdevLabel;
-     virSecurityDomainSetHostdevLabel domainSetSecurityHostdevLabel;
-     virSecurityDomainSetSavedStateLabel domainSetSavedStateLabel;
-+    virSecurityDomainSetSavedStateLabelRO domainSetSavedStateLabelRO;
-     virSecurityDomainRestoreSavedStateLabel domainRestoreSavedStateLabel;
- 
-     /*
-diff -rup libvirt-0.7.1/src/security_selinux.c new/src/security_selinux.c
---- libvirt-0.7.1/src/security_selinux.c	2010-05-17 17:55:34.000000000 -0400
-+++ new/src/security_selinux.c	2010-05-18 11:49:24.542106000 -0400
-@@ -364,12 +364,20 @@ SELinuxRestoreSecurityFileLabel(virConne
-         goto err;
-     }
- 
--    if (stat(newpath, &buf) != 0)
-+    if (stat(newpath, &buf) != 0) {
-+        virReportSystemError(conn, err,
-+                             _("cannot stat %s"), newpath);
-         goto err;
-+    }
- 
--    if (matchpathcon(newpath, buf.st_mode, &fcon) == 0)  {
--        rc = SELinuxSetFilecon(conn, newpath, fcon);
-+    if (matchpathcon(newpath, buf.st_mode, &fcon) != 0)  {
-+        virReportSystemError(conn, err,
-+                             _("failed to determine default context for %s"), newpath);
-+        goto err;
-     }
-+
-+    rc = SELinuxSetFilecon(conn, newpath, fcon);
-+
- err:
-     VIR_FREE(fcon);
-     VIR_FREE(newpath);
-@@ -632,7 +640,17 @@ SELinuxSetSavedStateLabel(virConnectPtr 
- 
- 
- static int
-+SELinuxSetSavedStateLabelRO(virConnectPtr conn,
-+                            virDomainObjPtr vm ATTRIBUTE_UNUSED,
-+                            const char *savefile)
-+{
-+    return SELinuxSetFilecon(conn, savefile, default_content_context);
-+}
-+
-+
-+static int
- SELinuxRestoreSavedStateLabel(virConnectPtr conn,
-+                              virDomainObjPtr vm ATTRIBUTE_UNUSED,
-                               const char *savefile)
- {
-     return SELinuxRestoreSecurityFileLabel(conn, savefile);
-@@ -709,5 +727,6 @@ virSecurityDriver virSELinuxSecurityDriv
-     .domainSetSecurityHostdevLabel = SELinuxSetSecurityHostdevLabel,
-     .domainRestoreSecurityHostdevLabel = SELinuxRestoreSecurityHostdevLabel,
-     .domainSetSavedStateLabel = SELinuxSetSavedStateLabel,
-+    .domainSetSavedStateLabelRO = SELinuxSetSavedStateLabelRO,
-     .domainRestoreSavedStateLabel = SELinuxRestoreSavedStateLabel,
- };

libvirt-0.7.1-fix-usb-busaddr.patch

@@ -1,22 +0,0 @@
-commit 823a684f8d0495bd5e7b413e1a81fd5a600abef7
-Author: Daniel P. Berrange <berrange@redhat.com>
-Date:   Thu Feb 11 14:39:13 2010 +0000
-
-    Fix USB device path formatting mixup
-    
-    * src/util/hostusb.c: The device path for a USB device wants the
-      bus/device IDs in decimal not octal
-
-diff --git a/src/util/hostusb.c b/src/util/hostusb.c
-index 3cce66b..bf96539 100644
---- a/src/hostusb.c
-+++ b/src/hostusb.c
-@@ -184,7 +184,7 @@ usbGetDevice(unsigned bus,
-     snprintf(dev->name, sizeof(dev->name), "%.3o:%.3o",
-              dev->bus, dev->dev);
-     snprintf(dev->path, sizeof(dev->path),
--             USB_DEVFS "%03o/%03o", dev->bus, dev->dev);
-+             USB_DEVFS "%03d/%03d", dev->bus, dev->dev);
- 
-     /* XXX fixme. this should be product/vendor */
-     snprintf(dev->id, sizeof(dev->id), "%d %d", dev->bus, dev->dev);

libvirt-0.7.1-fix-usb-product.patch

@@ -1,496 +0,0 @@
-diff -rup libvirt-0.7.1/src/hostusb.c new/src/hostusb.c
---- libvirt-0.7.1/src/hostusb.c	2010-05-17 16:53:48.740748000 -0400
-+++ new/src/hostusb.c	2010-05-17 16:57:19.294731000 -0400
-@@ -37,9 +37,10 @@
- #include "util.h"
- #include "virterror_internal.h"
- 
-+#define USB_SYSFS "/sys/bus/usb"
- #define USB_DEVFS "/dev/bus/usb/"
--#define USB_ID_LEN 10 /* "XXXX XXXX" */
--#define USB_ADDR_LEN 8 /* "XXX:XXX" */
-+#define USB_ID_LEN 10 /* "1234 5678" */
-+#define USB_ADDR_LEN 8 /* "123:456" */
- 
- struct _usbDevice {
-     unsigned      bus;
-@@ -57,6 +58,101 @@ struct _usbDevice {
-     virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__,  \
-                          __FUNCTION__, __LINE__, fmt)
- 
-+static int usbSysReadFile(virConnectPtr conn,
-+                          const char *f_name, const char *d_name,
-+                          int base, unsigned *value)
-+{
-+    int ret = -1, tmp;
-+    char *buf = NULL;
-+    char *filename = NULL;
-+    char *ignore = NULL;
-+
-+    tmp = virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name);
-+    if (tmp < 0) {
-+        virReportOOMError(conn);
-+        goto error;
-+    }
-+
-+    if (virFileReadAll(filename, 1024, &buf) < 0)
-+        goto error;
-+
-+    if (virStrToLong_ui(buf, &ignore, base, value) < 0) {
-+        usbReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                       _("Could not parse usb file %s"), filename);
-+        goto error;
-+    }
-+
-+    ret = 0;
-+error:
-+    VIR_FREE(filename);
-+    VIR_FREE(buf);
-+    return ret;
-+}
-+
-+static int usbFindBusByVendor(virConnectPtr conn,
-+                              unsigned vendor, unsigned product,
-+                              unsigned *bus, unsigned *devno)
-+{
-+    DIR *dir = NULL;
-+    int ret = -1, found = 0;
-+    char *ignore = NULL;
-+    struct dirent *de;
-+
-+    dir = opendir(USB_SYSFS "/devices");
-+    if (!dir) {
-+        virReportSystemError(conn, errno,
-+                             _("Could not open directory %s"),
-+                             USB_SYSFS "/devices");
-+        goto error;
-+    }
-+
-+    while ((de = readdir(dir))) {
-+        unsigned found_prod, found_vend;
-+        if (de->d_name[0] == '.' || strchr(de->d_name, ':'))
-+            continue;
-+
-+        if (usbSysReadFile(conn, "idVendor", de->d_name,
-+                           16, &found_vend) < 0)
-+            goto error;
-+        if (usbSysReadFile(conn, "idProduct", de->d_name,
-+                           16, &found_prod) < 0)
-+            goto error;
-+
-+        if (found_prod == product && found_vend == vendor) {
-+            /* Lookup bus.addr info */
-+            char *tmpstr = de->d_name;
-+            unsigned found_bus, found_addr;
-+
-+            if (STREQ(de->d_name, "usb"))
-+                tmpstr += 3;
-+
-+            if (virStrToLong_ui(tmpstr, &ignore, 10, &found_bus) < 0) {
-+                usbReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                               _("Failed to parse dir name '%s'"),
-+                               de->d_name);
-+                goto error;
-+            }
-+
-+            if (usbSysReadFile(conn, "devnum", de->d_name,
-+                               10, &found_addr) < 0)
-+                goto error;
-+
-+            *bus = found_bus;
-+            *devno = found_addr;
-+            found = 1;
-+            break;
-+        }
-+    }
-+
-+    if (!found)
-+        usbReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                       _("Did not find USB device %x:%x"), vendor, product);
-+    else
-+        ret = 0;
-+
-+error:
-+    return ret;
-+}
- 
- usbDevice *
- usbGetDevice(virConnectPtr conn,
-@@ -86,6 +182,21 @@ usbGetDevice(virConnectPtr conn,
-     return dev;
- }
- 
-+
-+usbDevice *
-+usbFindDevice(unsigned vendor,
-+              unsigned product)
-+{
-+    unsigned bus = 0, devno = 0;
-+
-+    if (usbFindBusByVendor(vendor, product, &bus, &devno) < 0) {
-+        return NULL;
-+    }
-+
-+    return usbGetDevice(bus, devno);
-+}
-+
-+
- void
- usbFreeDevice(virConnectPtr conn ATTRIBUTE_UNUSED, usbDevice *dev)
- {
-@@ -93,6 +204,18 @@ usbFreeDevice(virConnectPtr conn ATTRIBU
-     VIR_FREE(dev);
- }
- 
-+unsigned usbDeviceGetBus(usbDevice *dev)
-+{
-+    return dev->bus;
-+}
-+
-+
-+unsigned usbDeviceGetDevno(usbDevice *dev)
-+{
-+    return dev->dev;
-+}
-+
-+
- 
- int usbDeviceFileIterate(virConnectPtr conn,
-                          usbDevice *dev,
-diff -rup libvirt-0.7.1/src/hostusb.h new/src/hostusb.h
---- libvirt-0.7.1/src/hostusb.h	2009-09-10 09:45:00.000000000 -0400
-+++ new/src/hostusb.h	2010-05-17 16:58:06.553924000 -0400
-@@ -27,11 +27,16 @@
- 
- typedef struct _usbDevice usbDevice;
- 
--usbDevice *usbGetDevice      (virConnectPtr  conn,
--                              unsigned       bus,
--                              unsigned       devno);
--void       usbFreeDevice     (virConnectPtr  conn,
--                              usbDevice     *dev);
-+usbDevice *usbGetDevice(virConnectPtr conn,
-+                        unsigned bus,
-+                        unsigned devno);
-+usbDevice *usbFindDevice(virConnectPtr conn,
-+                         unsigned vendor,
-+                         unsigned product);
-+void       usbFreeDevice (virConnectPtr conn, usbDevice *dev);
-+
-+unsigned usbDeviceGetBus(usbDevice *dev);
-+unsigned usbDeviceGetDevno(usbDevice *dev);
- 
- /*
-  * Callback that will be invoked once for each file
-diff -rup libvirt-0.7.1/src/libvirt_private.syms new/src/libvirt_private.syms
---- libvirt-0.7.1/src/libvirt_private.syms	2010-05-17 16:53:48.401831000 -0400
-+++ new/src/libvirt_private.syms	2010-05-17 16:55:03.001748000 -0400
-@@ -441,7 +441,10 @@ virFileMatchesNameSuffix;
- 
- # usb.h
- usbGetDevice;
-+usbFindDevice;
- usbFreeDevice;
-+usbDeviceGetBus;
-+usbDeviceGetDevno;
- usbDeviceFileIterate;
- 
- # uuid.h
-diff -rup libvirt-0.7.1/src/qemu_driver.c new/src/qemu_driver.c
---- libvirt-0.7.1/src/qemu_driver.c	2010-05-17 16:53:48.785743000 -0400
-+++ new/src/qemu_driver.c	2010-05-17 17:06:40.575145000 -0400
-@@ -1493,16 +1493,13 @@ qemuUpdateActivePciHostdevs(struct qemud
- }
- 
- static int
--qemuPrepareHostDevices(virConnectPtr conn,
--                       struct qemud_driver *driver,
--                       virDomainDefPtr def)
-+qemuPrepareHostPCIDevices(virConnectPtr conn,
-+                          struct qemud_driver *driver,
-+                          virDomainDefPtr def)
- {
-     pciDeviceList *pcidevs;
-     int i;
- 
--    if (!def->nhostdevs)
--        return 0;
--
-     if (!(pcidevs = qemuGetPciHostDeviceList(conn, def)))
-         return -1;
- 
-@@ -1792,14 +1789,11 @@ static int qemuDomainSetHostdevUSBOwners
-     struct qemuFileOwner owner = { uid, gid };
-     int ret = -1;
- 
--    /* XXX what todo for USB devs assigned based on product/vendor ? Doom :-( */
--    if (!def->source.subsys.u.usb.bus ||
--        !def->source.subsys.u.usb.device)
--        return 0;
--
-     usbDevice *dev = usbGetDevice(conn,
-                                   def->source.subsys.u.usb.bus,
--                                  def->source.subsys.u.usb.device);
-+                                  def->source.subsys.u.usb.device,
-+                                  def->source.subsys.u.usb.vendor,
-+                                  def->source.subsys.u.usb.product);
- 
-     if (!dev)
-         goto cleanup;
-@@ -2065,13 +2059,17 @@ static int qemudStartVMDaemon(virConnect
-         return -1;
-     }
- 
-+    DEBUG0("Preparing host devices");
-+    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
-+        goto cleanup;
-+
-     /* If you are using a SecurityDriver with dynamic labelling,
-        then generate a security label for isolation */
-     if (vm->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC &&
-         driver->securityDriver &&
-         driver->securityDriver->domainGenSecurityLabel &&
-         driver->securityDriver->domainGenSecurityLabel(conn, vm) < 0)
--        return -1;
-+        return cleanup;
- 
-     /* Ensure no historical cgroup for this VM is lieing around bogus settings */
-     qemuRemoveCgroup(conn, driver, vm);
-@@ -2119,9 +2117,6 @@ static int qemudStartVMDaemon(virConnect
-     if (qemuSetupCgroup(conn, driver, vm) < 0)
-         goto cleanup;
- 
--    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
--        goto cleanup;
--
-     if (VIR_ALLOC(vm->monitor_chr) < 0) {
-         virReportOOMError(conn);
-         goto cleanup;
-@@ -2348,6 +2343,56 @@ retry:
- }
- 
- 
-+
-+static int
-+qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED,
-+                          virDomainDefPtr def)
-+{
-+    int i;
-+    for (i = 0 ; i < def->nhostdevs ; i++) {
-+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-+
-+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-+            continue;
-+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)
-+            continue;
-+
-+        /* Resolve a vendor/product to bus/device */
-+        if (hostdev->source.subsys.u.usb.vendor) {
-+            usbDevice *usb
-+                = usbFindDevice(hostdev->source.subsys.u.usb.vendor,
-+                                hostdev->source.subsys.u.usb.product);
-+
-+            if (!usb)
-+                return -1;
-+
-+            hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb);
-+            hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb);
-+
-+            usbFreeDevice(usb);
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+qemuPrepareHostDevices(struct qemud_driver *driver,
-+                       virDomainDefPtr def)
-+{
-+    if (!def->nhostdevs)
-+        return 0;
-+
-+    if (qemuPrepareHostPCIDevices(driver, def) < 0)
-+        return -1;
-+
-+    if (qemuPrepareHostUSBDevices(driver, def) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- static void
- qemudDispatchVMEvent(int watch, int fd, int events, void *opaque) {
-     struct qemud_driver *driver = opaque;
-@@ -6294,6 +6339,23 @@ static int qemudDomainDetachHostDevice(v
-         return -1;
-     }
- 
-+    /* Resolve USB product/vendor to bus/device */
-+    if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB &&
-+        hostdev->source.subsys.u.usb.vendor) {
-+        usbDevice *usb
-+            = usbFindDevice(hostdev->source.subsys.u.usb.vendor,
-+                            hostdev->source.subsys.u.usb.product);
-+
-+        if (!usb)
-+            return -1;
-+
-+        hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb);
-+        hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb);
-+
-+        usbFreeDevice(usb);
-+    }
-+
-+
-     if (driver->securityDriver &&
-         driver->securityDriver->domainSetSecurityHostdevLabel(conn, vm, dev->data.hostdev) < 0)
-         VIR_WARN0("Failed to restore device labelling");
-diff -rup libvirt-0.7.1/src/security_selinux.c new/src/security_selinux.c
---- libvirt-0.7.1/src/security_selinux.c	2010-05-17 16:53:48.775745000 -0400
-+++ new/src/security_selinux.c	2010-05-17 16:58:47.442604000 -0400
-@@ -482,20 +482,15 @@ SELinuxSetSecurityHostdevLabel(virConnec
- 
-     switch (dev->source.subsys.type) {
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: {
--        if (dev->source.subsys.u.usb.bus && dev->source.subsys.u.usb.device) {
--            usbDevice *usb = usbGetDevice(conn,
--                                          dev->source.subsys.u.usb.bus,
--                                          dev->source.subsys.u.usb.device);
--
--            if (!usb)
--                goto done;
--
--            ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm);
--            usbFreeDevice(conn, usb);
--        } else {
--            /* XXX deal with product/vendor better */
--            ret = 0;
--        }
-+        usbDevice *usb = usbGetDevice(conn,
-+                                      dev->source.subsys.u.usb.bus,
-+                                      dev->source.subsys.u.usb.device);
-+
-+        if (!usb)
-+            goto done;
-+
-+        ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm);
-+        usbFreeDevice(conn, usb);
-         break;
-     }
- 
-diff -rup libvirt-0.7.1/src/hostusb.c new/src/hostusb.c
---- libvirt-0.7.1/src/hostusb.c	2010-05-17 17:09:02.573638000 -0400
-+++ new/src/hostusb.c	2010-05-17 17:29:49.133509000 -0400
-@@ -184,16 +184,17 @@ usbGetDevice(virConnectPtr conn,
- 
- 
- usbDevice *
--usbFindDevice(unsigned vendor,
-+usbFindDevice(virConnectPtr conn,
-+              unsigned vendor,
-               unsigned product)
- {
-     unsigned bus = 0, devno = 0;
- 
--    if (usbFindBusByVendor(vendor, product, &bus, &devno) < 0) {
-+    if (usbFindBusByVendor(conn, vendor, product, &bus, &devno) < 0) {
-         return NULL;
-     }
- 
--    return usbGetDevice(bus, devno);
-+    return usbGetDevice(conn, bus, devno);
- }
- 
- 
-diff -rup libvirt-0.7.1/src/qemu_driver.c new/src/qemu_driver.c
---- libvirt-0.7.1/src/qemu_driver.c	2010-05-17 17:09:02.602638000 -0400
-+++ new/src/qemu_driver.c	2010-05-17 17:36:10.066214000 -0400
-@@ -1791,9 +1791,7 @@ static int qemuDomainSetHostdevUSBOwners
- 
-     usbDevice *dev = usbGetDevice(conn,
-                                   def->source.subsys.u.usb.bus,
--                                  def->source.subsys.u.usb.device,
--                                  def->source.subsys.u.usb.vendor,
--                                  def->source.subsys.u.usb.product);
-+                                  def->source.subsys.u.usb.device);
- 
-     if (!dev)
-         goto cleanup;
-@@ -2026,6 +2024,10 @@ qemuPrepareMonitorChr(virConnectPtr conn
-     return 0;
- }
- 
-+static int
-+qemuPrepareHostDevices(struct qemud_driver *driver,
-+                       virDomainDefPtr def);
-+
- static int qemudStartVMDaemon(virConnectPtr conn,
-                               struct qemud_driver *driver,
-                               virDomainObjPtr vm,
-@@ -2060,7 +2062,7 @@ static int qemudStartVMDaemon(virConnect
-     }
- 
-     DEBUG0("Preparing host devices");
--    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
-+    if (qemuPrepareHostDevices(driver, vm->def) < 0)
-         goto cleanup;
- 
-     /* If you are using a SecurityDriver with dynamic labelling,
-@@ -2069,7 +2071,7 @@ static int qemudStartVMDaemon(virConnect
-         driver->securityDriver &&
-         driver->securityDriver->domainGenSecurityLabel &&
-         driver->securityDriver->domainGenSecurityLabel(conn, vm) < 0)
--        return cleanup;
-+        goto cleanup;
- 
-     /* Ensure no historical cgroup for this VM is lieing around bogus settings */
-     qemuRemoveCgroup(conn, driver, vm);
-@@ -2360,7 +2362,8 @@ qemuPrepareHostUSBDevices(struct qemud_d
-         /* Resolve a vendor/product to bus/device */
-         if (hostdev->source.subsys.u.usb.vendor) {
-             usbDevice *usb
--                = usbFindDevice(hostdev->source.subsys.u.usb.vendor,
-+                = usbFindDevice(NULL,
-+                                hostdev->source.subsys.u.usb.vendor,
-                                 hostdev->source.subsys.u.usb.product);
- 
-             if (!usb)
-@@ -2369,7 +2372,7 @@ qemuPrepareHostUSBDevices(struct qemud_d
-             hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb);
-             hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb);
- 
--            usbFreeDevice(usb);
-+            usbFreeDevice(NULL, usb);
-         }
-     }
- 
-@@ -2383,7 +2386,7 @@ qemuPrepareHostDevices(struct qemud_driv
-     if (!def->nhostdevs)
-         return 0;
- 
--    if (qemuPrepareHostPCIDevices(driver, def) < 0)
-+    if (qemuPrepareHostPCIDevices(NULL, driver, def) < 0)
-         return -1;
- 
-     if (qemuPrepareHostUSBDevices(driver, def) < 0)
-@@ -6343,7 +6346,8 @@ static int qemudDomainDetachHostDevice(v
-     if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB &&
-         hostdev->source.subsys.u.usb.vendor) {
-         usbDevice *usb
--            = usbFindDevice(hostdev->source.subsys.u.usb.vendor,
-+            = usbFindDevice(NULL,
-+                            hostdev->source.subsys.u.usb.vendor,
-                             hostdev->source.subsys.u.usb.product);
- 
-         if (!usb)
-@@ -6352,7 +6356,7 @@ static int qemudDomainDetachHostDevice(v
-         hostdev->source.subsys.u.usb.bus = usbDeviceGetBus(usb);
-         hostdev->source.subsys.u.usb.device = usbDeviceGetDevno(usb);
- 
--        usbFreeDevice(usb);
-+        usbFreeDevice(NULL, usb);
-     }
- 
- 

libvirt-0.7.1-gcrypt-thread-init.patch

@@ -1,686 +0,0 @@
-commit 33a198c1f6a4a1bc7f34d50a31032e03bec10fee
-Author: Daniel P. Berrange <berrange@redhat.com>
-Date:   Fri Jul 17 20:20:08 2009 +0100
-
-    Initialize gcrypt threading
-    
-    GNUTLS uses gcrypt for its crypto functions. gcrypt requires
-    that the app/library initializes threading before using it.
-    We don't want to force apps using libvirt to know about
-    gcrypt, so we make virInitialize init threading on their
-    behalf. This location also ensures libvirtd has initialized
-    it correctly. This initialization is required even if libvirt
-    itself were only using one thread, since another non-libvirt
-    library (eg GTK-VNC) could also be using gcrypt from another
-    thread
-    
-    * src/libvirt.c: Register thread functions for gcrypt
-    * configure.in: Add -lgcrypt to linker flags
-
-diff --git a/src/libvirt.c b/src/libvirt.c
-index 103b331..cad33c2 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -22,6 +22,7 @@
- #include <sys/wait.h>
- #endif
- #include <time.h>
-+#include <gcrypt.h>
- 
- #include <libxml/parser.h>
- #include <libxml/xpath.h>
-@@ -251,6 +252,55 @@ winsock_init (void)
- }
- #endif
- 
-+static int virTLSMutexInit (void **priv)
-+{                                                                             \
-+    virMutexPtr lock = NULL;
-+
-+    if (VIR_ALLOC(lock) < 0)
-+        return ENOMEM;
-+
-+    if (virMutexInit(lock) < 0) {
-+        VIR_FREE(lock);
-+        return errno;
-+    }
-+
-+    *priv = lock;
-+    return 0;
-+}
-+
-+static int virTLSMutexDestroy(void **priv)
-+{
-+    virMutexPtr lock = *priv;
-+    virMutexDestroy(lock);
-+    VIR_FREE(lock);
-+    return 0;
-+}
-+
-+static int virTLSMutexLock(void **priv)
-+{
-+    virMutexPtr lock = *priv;
-+    virMutexLock(lock);
-+    return 0;
-+}
-+
-+static int virTLSMutexUnlock(void **priv)
-+{
-+    virMutexPtr lock = *priv;
-+    virMutexUnlock(lock);
-+    return 0;
-+}
-+
-+static struct gcry_thread_cbs virTLSThreadImpl = {
-+    (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
-+    NULL,
-+    virTLSMutexInit,
-+    virTLSMutexDestroy,
-+    virTLSMutexLock,
-+    virTLSMutexUnlock,
-+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-+};
-+
-+
- /**
-  * virInitialize:
-  *
-@@ -273,6 +323,9 @@ virInitialize(void)
-         virRandomInitialize(time(NULL) ^ getpid()))
-         return -1;
- 
-+    gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl);
-+    gcry_check_version(NULL);
-+
-     virLogSetFromEnv();
- 
-     DEBUG0("register drivers");
-commit 1c5c63338c90f6e82731f6871901dc72732033ef
-Author: Matthias Bolte <matthias.bolte@googlemail.com>
-Date:   Fri Dec 18 12:02:07 2009 +0100
-
-    Fix compilation with gcrypt < 1.4.2
-    
-    Commit 33a198c1f6a4a1bc7f34d50a31032e03bec10fee increased the gcrypt
-    version requirement to 1.4.2 because the GCRY_THREAD_OPTION_VERSION
-    define was added in this version.
-    
-    The configure script doesn't check for the gcrypt version. To support
-    gcrypt versions < 1.4.2 change the virTLSThreadImpl initialization
-    to use GCRY_THREAD_OPTION_VERSION only if it's defined.
-
-diff --git a/src/libvirt.c b/src/libvirt.c
-index 5167bc2..16c851f 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -291,7 +291,12 @@ static int virTLSMutexUnlock(void **priv)
- }
- 
- static struct gcry_thread_cbs virTLSThreadImpl = {
-+    /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */
-+#ifdef GCRY_THREAD_OPTION_VERSION
-     (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
-+#else
-+    GCRY_THREAD_OPTION_PTHREAD,
-+#endif
-     NULL,
-     virTLSMutexInit,
-     virTLSMutexDestroy,
-diff -rup libvirt-0.7.1/aclocal.m4 gcrypt-new/aclocal.m4
---- libvirt-0.7.1/aclocal.m4	2009-09-15 08:35:04.000000000 -0400
-+++ gcrypt-new/aclocal.m4	2010-05-17 17:52:13.765215000 -0400
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-@@ -190,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.11.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -206,7 +206,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff -rup libvirt-0.7.1/configure gcrypt-new/configure
---- libvirt-0.7.1/configure	2009-09-15 08:35:09.000000000 -0400
-+++ gcrypt-new/configure	2010-05-17 17:52:18.706838000 -0400
-@@ -43324,7 +43324,7 @@ fi
- $as_echo "$as_me: error: You must install the GnuTLS library in order to compile and run libvirt" >&2;}
-    { (exit 1); exit 1; }; }
- 
--  GNUTLS_LIBS=$LIBS
-+      GNUTLS_LIBS="$LIBS -lgcrypt"
-   LIBS="$old_libs"
- fi
- 
-diff -rup libvirt-0.7.1/docs/devhelp/Makefile.in gcrypt-new/docs/devhelp/Makefile.in
---- libvirt-0.7.1/docs/devhelp/Makefile.in	2009-09-15 08:35:13.000000000 -0400
-+++ gcrypt-new/docs/devhelp/Makefile.in	2010-05-17 17:52:23.305455000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/docs/examples/Makefile.in gcrypt-new/docs/examples/Makefile.in
---- libvirt-0.7.1/docs/examples/Makefile.in	2009-09-15 08:35:14.000000000 -0400
-+++ gcrypt-new/docs/examples/Makefile.in	2010-05-17 17:52:23.492454000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -999,7 +999,7 @@ clean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -1024,7 +1024,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -rup libvirt-0.7.1/docs/examples/python/Makefile.in gcrypt-new/docs/examples/python/Makefile.in
---- libvirt-0.7.1/docs/examples/python/Makefile.in	2009-09-15 08:35:14.000000000 -0400
-+++ gcrypt-new/docs/examples/python/Makefile.in	2010-05-17 17:52:23.650454000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/docs/Makefile.in gcrypt-new/docs/Makefile.in
---- libvirt-0.7.1/docs/Makefile.in	2009-09-15 08:35:13.000000000 -0400
-+++ gcrypt-new/docs/Makefile.in	2010-05-17 17:52:23.143456000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -966,7 +966,7 @@ clean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -991,7 +991,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -rup libvirt-0.7.1/docs/schemas/Makefile.in gcrypt-new/docs/schemas/Makefile.in
---- libvirt-0.7.1/docs/schemas/Makefile.in	2009-09-15 08:35:14.000000000 -0400
-+++ gcrypt-new/docs/schemas/Makefile.in	2010-05-17 17:52:23.807456000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/examples/domain-events/events-c/Makefile.in gcrypt-new/examples/domain-events/events-c/Makefile.in
---- libvirt-0.7.1/examples/domain-events/events-c/Makefile.in	2009-09-15 08:35:14.000000000 -0400
-+++ gcrypt-new/examples/domain-events/events-c/Makefile.in	2010-05-17 17:52:23.983380000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/examples/hellolibvirt/Makefile.in gcrypt-new/examples/hellolibvirt/Makefile.in
---- libvirt-0.7.1/examples/hellolibvirt/Makefile.in	2009-09-15 08:35:14.000000000 -0400
-+++ gcrypt-new/examples/hellolibvirt/Makefile.in	2010-05-17 17:52:24.166378000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/gnulib/lib/Makefile.in gcrypt-new/gnulib/lib/Makefile.in
---- libvirt-0.7.1/gnulib/lib/Makefile.in	2009-09-15 08:35:14.000000000 -0400
-+++ gcrypt-new/gnulib/lib/Makefile.in	2010-05-17 17:52:24.409381000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -1128,7 +1128,7 @@ clean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -1153,7 +1153,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -rup libvirt-0.7.1/gnulib/tests/Makefile.in gcrypt-new/gnulib/tests/Makefile.in
---- libvirt-0.7.1/gnulib/tests/Makefile.in	2009-09-15 08:35:15.000000000 -0400
-+++ gcrypt-new/gnulib/tests/Makefile.in	2010-05-17 17:52:24.719382000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -1501,7 +1501,7 @@ clean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -1526,7 +1526,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -rup libvirt-0.7.1/include/libvirt/Makefile.in gcrypt-new/include/libvirt/Makefile.in
---- libvirt-0.7.1/include/libvirt/Makefile.in	2009-09-15 08:35:15.000000000 -0400
-+++ gcrypt-new/include/libvirt/Makefile.in	2010-05-17 17:52:25.069302000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/include/Makefile.in gcrypt-new/include/Makefile.in
---- libvirt-0.7.1/include/Makefile.in	2009-09-15 08:35:15.000000000 -0400
-+++ gcrypt-new/include/Makefile.in	2010-05-17 17:52:24.902313000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -896,7 +896,7 @@ clean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -921,7 +921,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -rup libvirt-0.7.1/Makefile.in gcrypt-new/Makefile.in
---- libvirt-0.7.1/Makefile.in	2009-09-15 08:35:18.000000000 -0400
-+++ gcrypt-new/Makefile.in	2010-05-17 17:52:28.423082000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -1060,7 +1060,7 @@ uninstall-pkgconfigDATA:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -1085,7 +1085,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -1265,7 +1265,8 @@ distdir: $(DISTFILES)
- 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
- 	  dist-hook
- 	-test -n "$(am__skip_mode_fix)" \
--	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -1309,17 +1310,17 @@ dist dist-all: distdir
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lzma*) \
--	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- 	*.tar.xz*) \
- 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
-diff -rup libvirt-0.7.1/proxy/Makefile.in gcrypt-new/proxy/Makefile.in
---- libvirt-0.7.1/proxy/Makefile.in	2009-09-15 08:35:15.000000000 -0400
-+++ gcrypt-new/proxy/Makefile.in	2010-05-17 17:52:25.334306000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/python/Makefile.in gcrypt-new/python/Makefile.in
---- libvirt-0.7.1/python/Makefile.in	2009-09-15 08:35:16.000000000 -0400
-+++ gcrypt-new/python/Makefile.in	2010-05-17 17:52:25.538302000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -1090,7 +1090,7 @@ clean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -1115,7 +1115,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -rup libvirt-0.7.1/python/tests/Makefile.in gcrypt-new/python/tests/Makefile.in
---- libvirt-0.7.1/python/tests/Makefile.in	2009-09-15 08:35:16.000000000 -0400
-+++ gcrypt-new/python/tests/Makefile.in	2010-05-17 17:52:25.702304000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/qemud/Makefile.in gcrypt-new/qemud/Makefile.in
---- libvirt-0.7.1/qemud/Makefile.in	2009-09-15 08:35:16.000000000 -0400
-+++ gcrypt-new/qemud/Makefile.in	2010-05-17 17:52:25.997229000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -1522,7 +1522,7 @@ remote_protocol.c: remote_protocol.h
- @WITH_LIBVIRTD_TRUE@	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
- @WITH_LIBVIRTD_TRUE@           ln -s ../default.xml \
- @WITH_LIBVIRTD_TRUE@	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
--@WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
-+@WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
- 
-@@ -1530,7 +1530,7 @@ remote_protocol.c: remote_protocol.h
- @WITH_LIBVIRTD_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
- @WITH_LIBVIRTD_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
- @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
--@WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
-+@WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
- @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
- @WITH_LIBVIRTD_TRUE@	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
- 
-@@ -1577,6 +1577,8 @@ remote_protocol.c: remote_protocol.h
- 
- @WITH_LIBVIRTD_TRUE@install-logrotate: libvirtd.logrotate
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
-+@WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
-+@WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
- @WITH_LIBVIRTD_TRUE@	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
- @WITH_LIBVIRTD_TRUE@	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
- 
-diff -rup libvirt-0.7.1/src/Makefile.in gcrypt-new/src/Makefile.in
---- libvirt-0.7.1/src/Makefile.in	2009-09-15 08:35:17.000000000 -0400
-+++ gcrypt-new/src/Makefile.in	2010-05-17 17:52:26.929151000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -598,9 +598,9 @@ am__objects_45 = libvirt_util_la-bridge.
- 	libvirt_util_la-pci.lo libvirt_util_la-hostusb.lo \
- 	libvirt_util_la-qparams.lo \
- 	libvirt_util_la-storage_encryption_conf.lo \
--	libvirt_util_la-threads.lo libvirt_util_la-uuid.lo \
--	libvirt_util_la-util.lo libvirt_util_la-virterror.lo \
--	libvirt_util_la-xml.lo
-+	libvirt_util_la-storage_file.lo libvirt_util_la-threads.lo \
-+	libvirt_util_la-uuid.lo libvirt_util_la-util.lo \
-+	libvirt_util_la-virterror.lo libvirt_util_la-xml.lo
- am_libvirt_util_la_OBJECTS = $(am__objects_45)
- libvirt_util_la_OBJECTS = $(am_libvirt_util_la_OBJECTS)
- libvirt_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-@@ -617,11 +617,11 @@ am__libvirt_lxc_SOURCES_DIST = lxc_conf.
- 	event.h hash.c hash.h iptables.c iptables.h logging.c \
- 	logging.h memory.c memory.h pci.c pci.h hostusb.c hostusb.h \
- 	qparams.c qparams.h storage_encryption_conf.h \
--	storage_encryption_conf.c threads.c threads.h \
--	threads-pthread.h threads-win32.h uuid.c uuid.h util.c util.h \
--	virterror.c virterror_internal.h xml.c xml.h capabilities.c \
--	capabilities.h domain_conf.c domain_conf.h nodeinfo.h \
--	nodeinfo.c
-+	storage_encryption_conf.c storage_file.c storage_file.h \
-+	threads.c threads.h threads-pthread.h threads-win32.h uuid.c \
-+	uuid.h util.c util.h virterror.c virterror_internal.h xml.c \
-+	xml.h capabilities.c capabilities.h domain_conf.c \
-+	domain_conf.h nodeinfo.h nodeinfo.c
- am__objects_46 = libvirt_lxc-lxc_conf.$(OBJEXT) \
- 	libvirt_lxc-lxc_container.$(OBJEXT) \
- 	libvirt_lxc-lxc_controller.$(OBJEXT) \
-@@ -633,6 +633,7 @@ am__objects_47 = libvirt_lxc-bridge.$(OB
- 	libvirt_lxc-memory.$(OBJEXT) libvirt_lxc-pci.$(OBJEXT) \
- 	libvirt_lxc-hostusb.$(OBJEXT) libvirt_lxc-qparams.$(OBJEXT) \
- 	libvirt_lxc-storage_encryption_conf.$(OBJEXT) \
-+	libvirt_lxc-storage_file.$(OBJEXT) \
- 	libvirt_lxc-threads.$(OBJEXT) libvirt_lxc-uuid.$(OBJEXT) \
- 	libvirt_lxc-util.$(OBJEXT) libvirt_lxc-virterror.$(OBJEXT) \
- 	libvirt_lxc-xml.$(OBJEXT)
-@@ -1485,6 +1486,7 @@ UTIL_SOURCES = \
- 		hostusb.c hostusb.h				\
- 		qparams.c qparams.h				\
- 		storage_encryption_conf.h storage_encryption_conf.c	\
-+		storage_file.c storage_file.h			\
- 		threads.c threads.h				\
- 		threads-pthread.h				\
- 		threads-win32.h					\
-@@ -2151,6 +2153,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-pci.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-qparams.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-storage_encryption_conf.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-storage_file.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-threads.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-util.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_lxc-uuid.Po@am__quote@
-@@ -2170,6 +2173,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-pci.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-qparams.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-storage_encryption_conf.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-storage_file.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-threads.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-util.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvirt_util_la-uuid.Plo@am__quote@
-@@ -2753,6 +2757,14 @@ libvirt_util_la-storage_encryption_conf.
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -c -o libvirt_util_la-storage_encryption_conf.lo `test -f 'storage_encryption_conf.c' || echo '$(srcdir)/'`storage_encryption_conf.c
- 
-+libvirt_util_la-storage_file.lo: storage_file.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -MT libvirt_util_la-storage_file.lo -MD -MP -MF $(DEPDIR)/libvirt_util_la-storage_file.Tpo -c -o libvirt_util_la-storage_file.lo `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_util_la-storage_file.Tpo $(DEPDIR)/libvirt_util_la-storage_file.Plo
-+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='storage_file.c' object='libvirt_util_la-storage_file.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -c -o libvirt_util_la-storage_file.lo `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
-+
- libvirt_util_la-threads.lo: threads.c
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_util_la_CFLAGS) $(CFLAGS) -MT libvirt_util_la-threads.lo -MD -MP -MF $(DEPDIR)/libvirt_util_la-threads.Tpo -c -o libvirt_util_la-threads.lo `test -f 'threads.c' || echo '$(srcdir)/'`threads.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_util_la-threads.Tpo $(DEPDIR)/libvirt_util_la-threads.Plo
-@@ -3065,6 +3077,22 @@ libvirt_lxc-storage_encryption_conf.obj:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -c -o libvirt_lxc-storage_encryption_conf.obj `if test -f 'storage_encryption_conf.c'; then $(CYGPATH_W) 'storage_encryption_conf.c'; else $(CYGPATH_W) '$(srcdir)/storage_encryption_conf.c'; fi`
- 
-+libvirt_lxc-storage_file.o: storage_file.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -MT libvirt_lxc-storage_file.o -MD -MP -MF $(DEPDIR)/libvirt_lxc-storage_file.Tpo -c -o libvirt_lxc-storage_file.o `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_lxc-storage_file.Tpo $(DEPDIR)/libvirt_lxc-storage_file.Po
-+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='storage_file.c' object='libvirt_lxc-storage_file.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -c -o libvirt_lxc-storage_file.o `test -f 'storage_file.c' || echo '$(srcdir)/'`storage_file.c
-+
-+libvirt_lxc-storage_file.obj: storage_file.c
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -MT libvirt_lxc-storage_file.obj -MD -MP -MF $(DEPDIR)/libvirt_lxc-storage_file.Tpo -c -o libvirt_lxc-storage_file.obj `if test -f 'storage_file.c'; then $(CYGPATH_W) 'storage_file.c'; else $(CYGPATH_W) '$(srcdir)/storage_file.c'; fi`
-+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_lxc-storage_file.Tpo $(DEPDIR)/libvirt_lxc-storage_file.Po
-+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='storage_file.c' object='libvirt_lxc-storage_file.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -c -o libvirt_lxc-storage_file.obj `if test -f 'storage_file.c'; then $(CYGPATH_W) 'storage_file.c'; else $(CYGPATH_W) '$(srcdir)/storage_file.c'; fi`
-+
- libvirt_lxc-threads.o: threads.c
- @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvirt_lxc_CFLAGS) $(CFLAGS) -MT libvirt_lxc-threads.o -MD -MP -MF $(DEPDIR)/libvirt_lxc-threads.Tpo -c -o libvirt_lxc-threads.o `test -f 'threads.c' || echo '$(srcdir)/'`threads.c
- @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libvirt_lxc-threads.Tpo $(DEPDIR)/libvirt_lxc-threads.Po
-diff -rup libvirt-0.7.1/tests/confdata/Makefile.in gcrypt-new/tests/confdata/Makefile.in
---- libvirt-0.7.1/tests/confdata/Makefile.in	2009-09-15 08:35:17.000000000 -0400
-+++ gcrypt-new/tests/confdata/Makefile.in	2010-05-17 17:52:27.383154000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/tests/Makefile.in gcrypt-new/tests/Makefile.in
---- libvirt-0.7.1/tests/Makefile.in	2009-09-15 08:35:17.000000000 -0400
-+++ gcrypt-new/tests/Makefile.in	2010-05-17 17:52:27.223153000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -1401,7 +1401,7 @@ clean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -1426,7 +1426,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-diff -rup libvirt-0.7.1/tests/sexpr2xmldata/Makefile.in gcrypt-new/tests/sexpr2xmldata/Makefile.in
---- libvirt-0.7.1/tests/sexpr2xmldata/Makefile.in	2009-09-15 08:35:17.000000000 -0400
-+++ gcrypt-new/tests/sexpr2xmldata/Makefile.in	2010-05-17 17:52:27.543159000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/tests/xencapsdata/Makefile.in gcrypt-new/tests/xencapsdata/Makefile.in
---- libvirt-0.7.1/tests/xencapsdata/Makefile.in	2009-09-15 08:35:18.000000000 -0400
-+++ gcrypt-new/tests/xencapsdata/Makefile.in	2010-05-17 17:52:27.704150000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/tests/xmconfigdata/Makefile.in gcrypt-new/tests/xmconfigdata/Makefile.in
---- libvirt-0.7.1/tests/xmconfigdata/Makefile.in	2009-09-15 08:35:18.000000000 -0400
-+++ gcrypt-new/tests/xmconfigdata/Makefile.in	2010-05-17 17:52:27.872118000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/tests/xml2sexprdata/Makefile.in gcrypt-new/tests/xml2sexprdata/Makefile.in
---- libvirt-0.7.1/tests/xml2sexprdata/Makefile.in	2009-09-15 08:35:18.000000000 -0400
-+++ gcrypt-new/tests/xml2sexprdata/Makefile.in	2010-05-17 17:52:28.046074000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -rup libvirt-0.7.1/tools/Makefile.in gcrypt-new/tools/Makefile.in
---- libvirt-0.7.1/tools/Makefile.in	2009-09-15 08:35:18.000000000 -0400
-+++ gcrypt-new/tools/Makefile.in	2010-05-17 17:52:28.213075000 -0400
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

libvirt-0.7.1-qemu-uri-crash.patch

@@ -1,29 +0,0 @@
-commit c11a82b62aefc21e070c527f59a1f9c57a7b4f36
-Author: Richard Jones <rjones@redhat.com>
-Date:   Thu Dec 10 16:39:07 2009 +0000
-
-    qemu driver: Fix segfault in libvirt/libvirtd when uri->path is NULL.
-    
-    See also:
-    https://bugzilla.redhat.com/show_bug.cgi?id=545400#c1
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 2fb059d..e9cc8c3 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -2651,6 +2651,15 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn,
-             return VIR_DRV_OPEN_ERROR;
-         }
- 
-+        if (conn->uri->path == NULL) {
-+            qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                             _("no QEMU URI path given, try %s"),
-+                             qemu_driver->privileged
-+                               ? "qemu:///system"
-+                               : "qemu:///session");
-+                return VIR_DRV_OPEN_ERROR;
-+        }
-+
-         if (qemu_driver->privileged) {
-             if (STRNEQ (conn->uri->path, "/system") &&
-                 STRNEQ (conn->uri->path, "/session")) {

libvirt-change-logrotate-config-to-weekly.patch

@@ -1,34 +0,0 @@
-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
-

libvirt-disable-audio-backend.patch

@@ -1,77 +0,0 @@
-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
-

libvirt-fix-crash-on-device-hotplug-parse-error.patch

@@ -1,31 +0,0 @@
-From a5fa9f63fcffbf70465386672f24edac439866b9 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Thu, 24 Sep 2009 15:42:25 +0100
-Subject: [PATCH] Fix crash in device hotplug cleanup code
-
-* src/qemu/qemu_driver.c: Fix crash in scenario where XML
-  parsing of hotplugged device failed & thus 'dev' is NULL
-
-(cherry picked from commit 879cd8cc2ba00f795913f296556e05f25afa7877)
-
-Fedora-patch: libvirt-fix-crash-on-device-hotplug-parse-error.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 0ce403c..c956258 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -5912,7 +5912,7 @@ cleanup:
-     if (cgroup)
-         virCgroupFree(&cgroup);
- 
--    if (ret < 0) {
-+    if (ret < 0 && dev != NULL) {
-         if (qemuDomainSetDeviceOwnership(dom->conn, driver, dev, 1) < 0)
-             VIR_WARN0("Fail to restore disk device ownership");
-         virDomainDeviceDefFree(dev);
--- 
-1.6.2.5
-

libvirt-fix-crash-on-missing-iface-target-dev.patch

@@ -1,33 +0,0 @@
-From 7bc1491deba6338e514504d1b68fe097e7f2bf19 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 1 Oct 2009 11:54:38 +0200
-Subject: [PATCH] Avoid a libvirtd crash on broken input 523418
-
-* src/conf/domain_conf.c: a simple typo in an XML domain file could lead
-  to a crash, because we called STRPREFIX() on the looked up value without
-  checking it was non-null.
-
-(cherry picked from commit 79d233b5ca62f86ab22d271d1f08ec20060eee88)
-
-Fedora-patch: libvirt-fix-crash-on-missing-iface-target-dev.patch
----
- src/domain_conf.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/domain_conf.c b/src/domain_conf.c
-index c424c67..476cdd7 100644
---- a/src/domain_conf.c
-+++ b/src/domain_conf.c
-@@ -1031,7 +1031,8 @@ virDomainNetDefParseXML(virConnectPtr conn,
-             } else if ((ifname == NULL) &&
-                        xmlStrEqual(cur->name, BAD_CAST "target")) {
-                 ifname = virXMLPropString(cur, "dev");
--                if (STRPREFIX((const char*)ifname, "vnet")) {
-+                if ((ifname != NULL) &&
-+                    (STRPREFIX((const char*)ifname, "vnet"))) {
-                     /* An auto-generated target name, blank it out */
-                     VIR_FREE(ifname);
-                 }
--- 
-1.6.2.5
-

libvirt-fix-device-detach-typo1.patch

@@ -1,29 +0,0 @@
-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
-

libvirt-fix-device-detach-typo2.patch

@@ -1,30 +0,0 @@
-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
-

libvirt-fix-device-detach-typo3.patch

@@ -1,30 +0,0 @@
-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
-

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

@@ -1,32 +0,0 @@
-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
-

libvirt-fix-libvirtd-leak-in-error-reply.patch

@@ -1,79 +0,0 @@
-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
-

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

@@ -1,46 +0,0 @@
-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
-

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

@@ -1,50 +0,0 @@
-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
-

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

@@ -1,53 +0,0 @@
-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
-

libvirt-fix-qemu-restore-from-raw1.patch

@@ -1,38 +0,0 @@
-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
-

libvirt-fix-qemu-restore-from-raw2.patch

@@ -1,120 +0,0 @@
-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
-

libvirt-fix-usb-device-passthrough.patch

@@ -1,41 +0,0 @@
-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
-

libvirt-fix-xen-driver-refcounting.patch

@@ -1,103 +0,0 @@
-From cab81502320d97dac4c5c12e7496f30896709c49 Mon Sep 17 00:00:00 2001
-From: Matthias Bolte <matthias.bolte@googlemail.com>
-Date: Tue, 22 Sep 2009 15:12:48 +0200
-Subject: [PATCH] Fix xen driver refcounting.
-
-The commit cb51aa48a777ddae6997faa9f28350cb62655ffd "Fix up connection
-reference counting." changed the driver closing and virConnectPtr
-unref-logic in virConnectClose().
-
-Before this commit virConnectClose() closed all drivers of the given
-virConnectPtr and virUnrefConnect()'ed it afterwards. After this
-commit the driver-closing is done in virUnrefConnect() if and only if
-the ref-count of the virConnectPtr dropped to zero.
-
-This change in execution order leads to a virConnectPtr leak, at least
-for connections to Xen.
-
-The relevant call sequences:
-
-virConnectOpen() -> xenUnifiedOpen() ...
-
-... xenInotifyOpen() -> virConnectRef(conn)
-
-... xenStoreOpen() -> xenStoreAddWatch() -> conn->refs++
-
-virConnectClose() -> xenUnifiedClose() ...
-
-... xenInotifyClose() -> virUnrefConnect(conn)
-
-... xenStoreClose() -> xenStoreRemoveWatch() -> virUnrefConnect(conn)
-
-Before the commit this additional virConnectRef/virUnrefConnect calls
-where no problem, because virConnectClose() closed the drivers
-explicitly and the additional refs added by the Xen subdrivers were
-removed properly. After the commit this additional refs result in a
-virConnectPtr leak (including a leak of the hypercall file handle;
-that's how I noticed this problem), because now the drivers are only
-close if and only if the ref-count drops to zero, but this cannot
-happen anymore, because the additional refs from the Xen subdrivers
-would only be removed if the drivers get closed, but that doesn't
-happen because the ref-count cannot drop to zero.
-
-The fix for this problem is simple: remove the
-virConnectRef/virUnrefConnect calls from the Xen subdrivers (see
-attached patch). Maybe someone could explain why the Xen Inotify and
-Xen Store driver do this extra ref-counting, but none of the other Xen
-subdrivers. It seems unnecessary to me and can be removed without
-problems.
-
-Signed-off-by: Chris Lalancette <clalance@redhat.com>
-
-(cherry picked from commit 6ed7374c5a6c6a2b1b1801d7d041dc7f09748592)
-
-Fedora-patch: libvirt-fix-xen-driver-refcounting.patch
----
- src/xen_inotify.c |    2 --
- src/xs_internal.c |    3 ---
- 2 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/src/xen_inotify.c b/src/xen_inotify.c
-index e312b9e..ecaefaf 100644
---- a/src/xen_inotify.c
-+++ b/src/xen_inotify.c
-@@ -463,7 +463,6 @@ xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
-         DEBUG0("Failed to add inotify handle, disabling events");
-     }
- 
--    virConnectRef(conn);
-     return 0;
- }
- 
-@@ -486,7 +485,6 @@ xenInotifyClose(virConnectPtr conn)
-     if (priv->inotifyWatch != -1)
-         virEventRemoveHandle(priv->inotifyWatch);
-     close(priv->inotifyFD);
--    virUnrefConnect(conn);
- 
-     return 0;
- }
-diff --git a/src/xs_internal.c b/src/xs_internal.c
-index 1f54b1f..a18dcad 100644
---- a/src/xs_internal.c
-+++ b/src/xs_internal.c
-@@ -1139,8 +1139,6 @@ int xenStoreAddWatch(virConnectPtr conn,
-     list->watches[n] = watch;
-     list->count++;
- 
--    conn->refs++;
--
-     return xs_watch(priv->xshandle, watch->path, watch->token);
- }
- 
-@@ -1190,7 +1188,6 @@ int xenStoreRemoveWatch(virConnectPtr conn,
-                 ; /* Failure to reduce memory allocation isn't fatal */
-             }
-             list->count--;
--            virUnrefConnect(conn);
-             return 0;
-         }
-     }
--- 
-1.6.2.5
-

libvirt-logrotate-avoid-compressing-small-logs.patch

@@ -1,31 +0,0 @@
-From 918724aa76982224437384d712c182c332fa5ef9 Mon Sep 17 00:00:00 2001
-From: Dan Kenigsberg <danken@redhat.com>
-Date: Wed, 21 Oct 2009 13:56:04 +0200
-Subject: [PATCH] Do not log rotate very small logs
-
-Without this, after few weeks without use, each defined domain grows a
-tail of empty gzipped logs, instead of keeping just the last log of
-interest.
-
-* daemon/libvirtd.logrotate.in: only rotate when the log is over 100 KBytes
-
-(cherry picked from commit b03fe2d0aefb57a096a102bf23375f0a167ca189)
-
-Fedora-patch: libvirt-logrotate-avoid-compressing-small-logs.patch
----
- qemud/libvirtd.logrotate.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qemud/libvirtd.logrotate.in b/qemud/libvirtd.logrotate.in
-index 093651c..0c51fd3 100644
---- a/qemud/libvirtd.logrotate.in
-+++ b/qemud/libvirtd.logrotate.in
-@@ -5,4 +5,5 @@
-         compress
-         delaycompress
-         copytruncate
-+        minsize 100k
- }
--- 
-1.6.2.5
-

libvirt-logrotate-create-lxc-uml-dirs.patch

@@ -1,54 +0,0 @@
-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
-

libvirt-network-delay-attribute-formatting.patch

@@ -1,32 +0,0 @@
-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
-

libvirt-qemu-machine-type-fixes1.patch

@@ -1,177 +0,0 @@
-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
-

libvirt-qemu-machine-type-fixes2.patch

@@ -1,42 +0,0 @@
-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
-

libvirt-regression-input-default-bus.patch

@@ -0,0 +1,31 @@
+From c9056e682a8a67dc29e39eb01392fcf8ee978c31 Mon Sep 17 00:00:00 2001
+From: Jonathan Wright <jonathan@almalinux.org>
+Date: Wed, 3 Jan 2024 09:26:59 -0600
+Subject: [PATCH] conf: Restore setting default bus for input devices
+
+Prior to v9.3.0-rc1~30 we used to set default bus for <input/>
+devices, during XML parsing. In the commit this code was moved to
+a post parse callback. But somehow the line that sets the bus in
+one specific case disappeared. Bring it back.
+
+Resolves: https://gitlab.com/libvirt/libvirt/-/issues/577
+Fixes: c4bc4d3b82fbe22e03c986ca896090f481df5c10
+Signed-off-by: Jonathan Wright <jonathan@almalinux.org>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_postparse.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
+index e79913b73f..ee27023f3e 100644
+--- a/src/conf/domain_postparse.c
++++ b/src/conf/domain_postparse.c
+@@ -657,6 +657,7 @@ virDomainInputDefPostParse(virDomainInputDef *input,
+             if ((input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
+                  input->type == VIR_DOMAIN_INPUT_TYPE_KBD) &&
+                 (ARCH_IS_X86(def->os.arch) || def->os.arch == VIR_ARCH_NONE)) {
++                    input->bus = VIR_DOMAIN_INPUT_BUS_PS2;
+             } else if (ARCH_IS_S390(def->os.arch) ||
+                        input->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) {
+                 input->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO;
+-- 

libvirt-storage-iscsi-auth-xml-formatting.patch

@@ -1,30 +0,0 @@
-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
-

sources

@@ -1 +1 @@
-f1cd360a5da38b847e166c6482141940  libvirt-0.7.1.tar.gz
+SHA512 (libvirt-9.7.0.tar.xz) = dd771822c0fa0861a32cab9d7f82235b101867fa0a4e8cf9a857ddfb2347e41b625b1e6f8791c4b3543fec836a1a23cae1fac4ce4b40debd51f2097bae46c949