* Fri Oct 9 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-11

- Fix libvirtd memory leak during error reply sending (#528162)
- Add several PCI hot-unplug typo fixes from upstream

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

@@ -0,0 +1,34 @@
+From bcd4180124afa20580d720912e2179b3a2f9295a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Mon, 5 Oct 2009 17:03:14 +0200
+Subject: [PATCH] 526769 change logrotate config default to weekly
+
+* daemon/libvirtd.logrotate.in: change to weekly rotation of logs,
+  keep a month worth of data and also extend to cover LXC and UML
+  domain logs
+
+(cherry picked from commit 529325bbdd050af89bda5a5c1a01b5553c49a57e)
+
+Fedora-patch: libvirt-change-logrotate-config-to-weekly.patch
+---
+ qemud/libvirtd.logrotate.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/qemud/libvirtd.logrotate.in b/qemud/libvirtd.logrotate.in
+index 9b42630..093651c 100644
+--- a/qemud/libvirtd.logrotate.in
++++ b/qemud/libvirtd.logrotate.in
+@@ -1,7 +1,7 @@
+-@localstatedir@/log/libvirt/qemu/*.log {
+-        daily
++@localstatedir@/log/libvirt/qemu/*.log @localstatedir@/log/libvirt/uml/*.log @localstatedir@/log/libvirt/lxc/*.log {
++        weekly
+         missingok
+-        rotate 7
++        rotate 4
+         compress
+         delaycompress
+         copytruncate
+-- 
+1.6.2.5
+

libvirt-fix-device-detach-typo1.patch

@@ -0,0 +1,29 @@
+From 58c38896a67c170063401d8091bae7dca8842923 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 23 Sep 2009 18:46:23 +0200
+Subject: [PATCH] Fix a typo in virDiskHasValidPciAddr()
+
+(cherry-picked from commit 3620e3cdcfe56cc4475b5ef1a0a893757240b795)
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Fedora-patch: libvirt-fix-device-detach-typo1.patch
+---
+ src/domain_conf.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/domain_conf.h b/src/domain_conf.h
+index 09368d9..d494e54 100644
+--- a/src/domain_conf.h
++++ b/src/domain_conf.h
+@@ -125,7 +125,7 @@ struct _virDomainDiskDef {
+ static inline int
+ virDiskHasValidPciAddr(virDomainDiskDefPtr def)
+ {
+-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
++    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
+ }
+ 
+ 
+-- 
+1.6.2.5
+

libvirt-fix-device-detach-typo2.patch

@@ -0,0 +1,30 @@
+From 81e967c716ce8c085be8baad9169f7772452d187 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 24 Sep 2009 08:55:55 +0100
+Subject: [PATCH] Fix a typo in virNetHasValidPciAddr() too
+
+* src/domain_conf.h: check domain/bus/slot, not domain/domain/slot
+
+(cherry-picked from commit 6bfffce91635bb08de601747e94ed1182c0f47eb)
+
+Fedora-patch: libvirt-fix-device-detach-typo2.patch
+---
+ src/domain_conf.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/domain_conf.h b/src/domain_conf.h
+index d494e54..7c918a7 100644
+--- a/src/domain_conf.h
++++ b/src/domain_conf.h
+@@ -207,7 +207,7 @@ struct _virDomainNetDef {
+ static inline int
+ virNetHasValidPciAddr(virDomainNetDefPtr def)
+ {
+-    return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot;
++    return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot;
+ }
+ 
+ enum virDomainChrSrcType {
+-- 
+1.6.2.5
+

libvirt-fix-device-detach-typo3.patch

@@ -0,0 +1,30 @@
+From 3a64779ec5a89d38d64e07bca2b11b19e1882d7a Mon Sep 17 00:00:00 2001
+From: Charles Duffy <charles@dyfis.net>
+Date: Thu, 24 Sep 2009 09:00:24 +0100
+Subject: [PATCH] Fix unitialized variable in qemudDomainDetachHostPciDevice()
+
+* src/qemu_driver.c: initialize detach var
+
+(cherry-picked from commit 580ad29288751234bee47ac9f6c04dac1dc529ea)
+
+Fedora-patch: libvirt-fix-device-detach-typo3.patch
+---
+ src/qemu_driver.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 7c7b985..550a59c 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -6126,7 +6126,7 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
+                                           virDomainObjPtr vm,
+                                           virDomainDeviceDefPtr dev)
+ {
+-    virDomainHostdevDefPtr detach;
++    virDomainHostdevDefPtr detach = NULL;
+     char *cmd, *reply;
+     int i, ret;
+     pciDevice *pci;
+-- 
+1.6.2.5
+

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

@@ -0,0 +1,79 @@
+From 71de8d92f20a9a9ee76d4d5df77ff477f1b7d441 Mon Sep 17 00:00:00 2001
+From: Matthias Bolte <matthias.bolte@googlemail.com>
+Date: Wed, 30 Sep 2009 02:17:27 +0200
+Subject: [PATCH] Fix memory leaks in libvirtd's message processing
+
+Commit 47cab734995fa9521b1df05d37e9978eedd8d3a2 changed the way how
+qemud_client_message objects were reused. Before this commit
+remoteDispatchClientRequest() reused the received message for normal responses
+and to report non-fatal errors. If a fatal error occurred qemudWorker() frees
+the message. After this commit non-fatal errors are reported by
+remoteSerializeReplyError() using a new qemud_client_message object and the
+original message leaks.
+
+To fix this leak the original message has to be freed if
+remoteSerializeReplyError() succeeds. If remoteSerializeReplyError()
+fails the original message is freed in qemudWorker().
+
+* daemon/dispatch.c: free qemud_client_message objects that will not be reused
+  and would leak otherwise, also free the allocated qemud_client_message object
+  in remoteSerializeError() if an error occurs
+
+(cherry-picked from commit c6f1459eb998619ab21a92d9bb87341f26978181)
+
+Fedora-patch: libvirt-fix-libvirtd-leak-in-error-reply.patch
+---
+ qemud/dispatch.c |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/qemud/dispatch.c b/qemud/dispatch.c
+index a60f2f4..ddb3215 100644
+--- a/qemud/dispatch.c
++++ b/qemud/dispatch.c
+@@ -191,6 +191,7 @@ remoteSerializeError(struct qemud_client *client,
+ 
+ xdr_error:
+     xdr_destroy(&xdr);
++    VIR_FREE(msg);
+ fatal_error:
+     xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
+     return -1;
+@@ -336,6 +337,7 @@ remoteDispatchClientRequest (struct qemud_server *server,
+                              struct qemud_client *client,
+                              struct qemud_client_message *msg)
+ {
++    int ret;
+     remote_error rerr;
+ 
+     memset(&rerr, 0, sizeof rerr);
+@@ -364,7 +366,12 @@ remoteDispatchClientRequest (struct qemud_server *server,
+     }
+ 
+ error:
+-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
++    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
++
++    if (ret >= 0)
++        VIR_FREE(msg);
++
++    return ret;
+ }
+ 
+ 
+@@ -521,8 +528,12 @@ remoteDispatchClientCall (struct qemud_server *server,
+ rpc_error:
+     /* Semi-bad stuff happened, we can still try to send back
+      * an RPC error message to client */
+-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
++    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
++
++    if (rv >= 0)
++        VIR_FREE(msg);
+ 
++    return rv;
+ 
+ xdr_error:
+     /* Seriously bad stuff happened, so we'll kill off this client
+-- 
+1.6.2.5
+

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

@@ -0,0 +1,54 @@
+From b7e3ac4f23befe67518b57e34691c301820a436c Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Tue, 6 Oct 2009 12:33:17 +0100
+Subject: [PATCH] Create /var/log/libvirt/{lxc,uml} dirs
+
+Otherwise logrotate barfs:
+
+  error: error accessing /var/log/libvirt/uml: No such file or directory
+  error: libvirtd:1 glob failed for /var/log/libvirt/uml/*.log
+  error: found error in /var/log/libvirt/qemu/*.log /var/log/libvirt/uml/*.log /var/log/libvirt/lxc/*.log , skipping
+
+* qemud/Makefile.am: always create /var/log/libvirt/{lxc,uml} when
+  installing the logrotate conf; not ideal, but easier than making
+  the logrotate conf depend on which drivers are enabled
+
+Fedora-patch: libvirt-logrotate-create-lxc-uml-dirs.patch
+---
+ qemud/Makefile.am |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/qemud/Makefile.am b/qemud/Makefile.am
+index 3d143da..a7f4bdf 100644
+--- a/qemud/Makefile.am
++++ b/qemud/Makefile.am
+@@ -176,7 +176,7 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+ 	test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \
+            ln -s ../default.xml \
+ 	    $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+-	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu
++	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt
+ 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
+ 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
+ 
+@@ -184,7 +184,7 @@ uninstall-local:: uninstall-init uninstall-data-sasl install-data-polkit
+ 	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
+ 	rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
+ 	rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
+-	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
++	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
+ 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
+ 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
+ 
+@@ -240,6 +240,8 @@ libvirtd.logrotate: libvirtd.logrotate.in
+ 
+ install-logrotate: libvirtd.logrotate
+ 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
++	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
++	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
+ 	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
+ 
+-- 
+1.6.2.5
+

libvirt.spec

@@ -22,14 +22,14 @@
 %endif
 
 
-# Now set the defaults for all the important features, independant
+# Now set the defaults for all the important features, independent
 # of any particular OS
 
 # First the daemon itself
 %define with_libvirtd      0%{!?_without_libvirtd:%{server_drivers}}
 %define with_avahi         0%{!?_without_avahi:%{server_drivers}}
 
-# Then the hypervisor drivers
+# Then the hypervisor drivers that run on local host
 %define with_xen           0%{!?_without_xen:%{server_drivers}}
 %define with_xen_proxy     0%{!?_without_xen_proxy:%{server_drivers}}
 %define with_qemu          0%{!?_without_qemu:%{server_drivers}}
@@ -37,9 +37,12 @@
 %define with_lxc           0%{!?_without_lxc:%{server_drivers}}
 %define with_vbox          0%{!?_without_vbox:%{server_drivers}}
 %define with_uml           0%{!?_without_uml:%{server_drivers}}
+# XXX this shouldn't be here, but it mistakenly links into libvirtd
 %define with_one           0%{!?_without_one:%{server_drivers}}
-%define with_phyp          0%{!?_without_phyp:%{server_drivers}}
-%define with_esx           0%{!?_without_esx:%{server_drivers}}
+
+# Then the hypervisor drivers that talk a native remote protocol
+%define with_phyp          0%{!?_without_phyp:1}
+%define with_esx           0%{!?_without_esx:1}
 
 # Then the secondary host drivers
 %define with_network       0%{!?_without_network:%{server_drivers}}
@@ -69,10 +72,6 @@
 %define with_xen 0
 %endif
 
-# Numactl is not available on s390[x]
-%ifarch s390 s390x
-%define with_numactl 0
-%endif
 
 # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX
 %if 0%{?rhel}
@@ -100,6 +99,7 @@
 %endif
 %define with_xen 0
 %endif
+
 # If Xen isn't turned on, we shouldn't build the xen proxy either
 %if ! %{with_xen}
 %define with_xen_proxy 0
@@ -151,7 +151,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 8%{?dist}%{?extra_release}
+Release: 11%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
@@ -175,6 +175,18 @@ Patch06: libvirt-disable-audio-backend.patch
 # Re-label qcow2 backing files (#497131)
 Patch07: libvirt-svirt-relabel-qcow2-backing-files.patch
 
+# Change logrotate config to weekly (#526769)
+Patch08: libvirt-change-logrotate-config-to-weekly.patch
+Patch09: libvirt-logrotate-create-lxc-uml-dirs.patch
+
+# Add several PCI hot-unplug typo fixes from upstream
+Patch10: libvirt-fix-device-detach-typo1.patch
+Patch11: libvirt-fix-device-detach-typo2.patch
+Patch12: libvirt-fix-device-detach-typo3.patch
+
+# Fix libvirtd memory leak during error reply sending (#528162)
+Patch13: libvirt-fix-libvirtd-leak-in-error-reply.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -334,6 +346,9 @@ BuildRequires: netcf-devel
 # Fedora build root suckage
 BuildRequires: gawk
 
+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+BuildRequires: automake
+
 %description
 Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
@@ -375,7 +390,7 @@ the virtualization capabilities of recent versions of Linux (and other OSes).
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}-%{release}
+Requires: libvirt-client = %{version}-%{release}
 
 %description python
 The libvirt-python package contains a module that permits applications
@@ -394,8 +409,17 @@ of recent versions of Linux (and other OSes).
 %patch05 -p1
 %patch06 -p1
 %patch07 -p1
+%patch08 -p1
+%patch09 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
+# Needed for libvirt-logrotate-create-lxc-uml-dirs.patch
+automake
+
 %if ! %{with_xen}
 %define _without_xen --without-xen
 %endif
@@ -618,7 +642,7 @@ fi
 
 /sbin/chkconfig --add libvirtd
 if [ "$1" -ge "1" ]; then
-    /sbin/service libvirtd condrestart > /dev/null 2>&1
+	/sbin/service libvirtd condrestart > /dev/null 2>&1
 fi
 %endif
 
@@ -651,6 +675,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
 
 %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
@@ -708,13 +735,11 @@ fi
 %endif
 
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
-%if %{with_qemu}
-%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
-%endif
 
 %if %{with_xen_proxy}
 %attr(4755, root, root) %{_libexecdir}/libvirt_proxy
 %endif
+
 %if %{with_lxc}
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
 %endif
@@ -784,6 +809,18 @@ fi
 %endif
 
 %changelog
+* Fri Oct  9 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-11
+- Fix libvirtd memory leak during error reply sending (#528162)
+- Add several PCI hot-unplug typo fixes from upstream
+
+* Tue Oct  6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-10
+- Create /var/log/libvirt/{lxc,uml} dirs for logrotate
+- Make libvirt-python dependon on libvirt-client
+- Sync misc minor changes from upstream spec
+
+* Tue Oct  6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-9
+- Change logrotate config to weekly (#526769)
+
 * Thu Oct  1 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.1-8
 - Disable sound backend, even when selinux is disabled (#524499)
 - Re-label qcow2 backing files (#497131)