Rebased to version 0.10.2.8

CVE-2013-4311: Insecure polkit usage (bz #1009539, bz #1005332) CVE-2013-4296: Invalid free memory stats (bz #1006173, bz #1009667) CVE-2013-4291: Supplementary groups handling (bz #1006509, bz #1006511) Fix LXC container creation if selinux disabled (bz #977114) Fix virsh change-media with block disk type (bz #951192)
Rebased to version 0.10.2.7
2013-09-20 17:30:22 -04:00 · 2013-08-01 19:32:09 -04:00 · 2013-06-12 18:35:13 -04:00 · 2013-06-12 18:16:33 -04:00 · 2013-06-12 17:57:01 -04:00 · 2013-05-19 18:57:02 -04:00
10 changed files with 2711 additions and 734 deletions
@@ -1,12 +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-0.1.gitf055724.tar.gz
@@ -0,0 +1,5 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz
@@ -0,0 +1,27 @@
+From 37865f1dead1fac2ee34af48f96d19d686296e04 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 13 Sep 2012 14:37:22 +0100
+Subject: [PATCH] Use 'qemu-system-i386' as binary instead of 'qemu'.
+
+---
+ src/qemu/qemu_capabilities.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index af3b0b2..179b3d2 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -244,8 +244,8 @@ static const struct qemu_feature_flags const arch_info_x86_64_flags [] = {
+ 
+ /* The archicture tables for supported QEMU archs */
+ static const struct qemu_arch_info const arch_info_hvm[] = {
+-    {  "i686",   32, NULL, "qemu",
+-       "qemu-system-x86_64", arch_info_i686_flags, 4 },
+    {  "i686",   32, NULL, "qemu-system-i386",
+       NULL, arch_info_i686_flags, 4 },
+     {  "x86_64", 64, NULL, "qemu-system-x86_64",
+        NULL, arch_info_x86_64_flags, 2 },
+     {  "arm",    32, NULL, "qemu-system-arm",    NULL, NULL, 0 },
+-- 
+1.7.11.4
+
@@ -4,7 +4,7 @@ NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))

 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef

 MAKEFILE_COMMON := $(shell $(find-makefile-common))
@@ -1,33 +0,0 @@
--- src/qemu_conf.c.orig	2009-05-29 19:24:59.000000000 +0200
-+++ src/qemu_conf.c	2009-05-29 19:19:39.000000000 +0200
-@@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr 
-     char uuid[VIR_UUID_STRING_BUFLEN];
-     char domid[50];
-     const char *cpu = NULL;
-+    int skipSound = 0;
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->name &&
-+        STREQ(driver->securityDriver->name, "selinux") &&
-+        getuid() == 0) {
-+        static int soundWarned = 0; 
-+        skipSound = 1;
-+        if (def->nsounds &&
-+            !soundWarned) {
-+            soundWarned = 1;
-+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
-+        }
-+    }
- 
-     uname_normalize(&ut);
- 
-@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr 
-     }
- 
-     /* Add sound hardware */
-    if (def->nsounds) {
-+    if (def->nsounds &&
-+        !skipSound) {
-         int size = 100;
-         char *modstr;
-         if (VIR_ALLOC_N(modstr, size+1) < 0)
@@ -1,248 +0,0 @@
-From 50f5a6c7ab7795fb6ade4bb24849fa2bab5084dd Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Wed, 29 Jul 2009 08:40:17 +0100
-Subject: [PATCH] Convert NEWS to UTF-8
-
-* docs/news.xsl: request UTF-8 as the output encoding
-
-* NEWS: re-generate with UTF-8 encoding
---
- NEWS          |   70 ++++++++++++++++++++++++++++----------------------------
- docs/news.xsl |    2 +-
- 2 files changed, 36 insertions(+), 36 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 447d2b4..0a838b9 100644
--- a/NEWS
-+++ b/NEWS
-@@ -137,7 +137,7 @@
-    - Improvements: add SCSI storage rescan (David Allan), rootless
-           LXC containers support improvements (Serge Hallyn), getHostname
-           support for LXC (Dan Smith), cleanup and logging output of some
-          domain functions (Guido Günther), drop pool lock when allocating
-+          domain functions (Guido GÃ¼nther), drop pool lock when allocating
-           volumes (Cole Robinson), LXC handle kernel without CLONE_NEWUSER
-           support (Serge Hallyn), cpu pinning on defined Xen domains (Takahashi
-           Tomohiro), dynamic bridge names support (Soren Hansen), LXC use
-@@ -145,7 +145,7 @@
-           virNodeDeviceCreateXML and virNodeDeviceDestroy entry points
-           (Dave Allan)
-    - Cleanups: don't hardcode getgrnam_r buffer to 1024 bytes (Guido
-          Günther), qemudBuildCommandLine API cleanup (Daniel Berrange),
-+          GÃ¼nther), qemudBuildCommandLine API cleanup (Daniel Berrange),
-           
- 
- 
-@@ -214,15 +214,15 @@
-           to avoid crashes (Daniel Berrange), mark defined network descriptions
-           as persistent (Cole Robinson), qemu+tls handshake negotiation hang
-           (Chris Lalancette)
-   - Improvements: don't hardcode ssh port (Guido Günther), new test
-+   - Improvements: don't hardcode ssh port (Guido GÃ¼nther), new test
-           cases and testing infrastructure (Jim Meyering), improve the
-           SExpr parser (John Levon), proper error reporting on xend
-           shutdown command (John Levon), proper handling of errors when
-          saving QEmu domains state (Guido Günther), revamp of the internal
-+          saving QEmu domains state (Guido GÃ¼nther), revamp of the internal
-           error memory APIs (John Levon), better virsh error reporting (John
-           Levon), more daemon options to allow running multiple daemons (Jim
-          Meyering), error handling when creating a QEmu domain (Guido Günther),
-          fix timeouts in QEmu log reading (Guido Günther), migration with
-+          Meyering), error handling when creating a QEmu domain (Guido GÃ¼nther),
-+          fix timeouts in QEmu log reading (Guido GÃ¼nther), migration with
-           xend 3.3 fixes (John Levon), virsh XML dump flags cleanup (Cole
-           Robinson), fix build with loadable drivers (Maximilian Wilhelm),
-           internal XML APIs to read long long and hexa values (Mark
-@@ -236,7 +236,7 @@
-           (Jim Meyering), many error handling cleanups (Jim Meyering), XML
-           module cleanups (Mark McLoughlin), compiler warning (Maximilian
-           Wilhelm), daemon TCP listen cleanup (Cole Robinson), size_t type
-          cleanup (Guido Günther), parallel make fix (Michael Marineau),
-+          cleanup (Guido GÃ¼nther), parallel make fix (Michael Marineau),
-           storage error diagnostic fix (Ryota Ozaki), remove redundant monitor
-           watch variable (Cole Robinson), qemu AttachDevice error report
-           improvement (Cole Robinson), virsh output cleanup (Jim Meyering),
-@@ -248,7 +248,7 @@
- 0.6.0: Jan 31 2009:
-    - New features: thread safety of the API and event handling (Daniel
-           Berrange), allow QEmu domains to survive daemon restart (Guido
-          Günther), extended logging capabilities, support copy-on-write
-+          GÃ¼nther), extended logging capabilities, support copy-on-write
-           storage volumes (Daniel Berrange), support of storage cache
-           control options for QEmu/KVM (Daniel Berrange)
-    - Portability: fix old DBus API problem, Debian portability fix
-@@ -260,13 +260,13 @@
-           solaris Xen fixes (John Levon), RPC portability to Solaris (Daniel
-           Berrange)
-    - Documentation: typo fixes (Richard Jones), logging support,
-          vnc keymap attributes (Guido Günther), HACKING file updates
-+          vnc keymap attributes (Guido GÃ¼nther), HACKING file updates
-          (Jim Meyering), new PCI passthrough format, libvirt-qpid and
-          UML driver documentation (Daniel Berrange), provide RNG schemas
-          for all XML formats used in libvirt APIs (Daniel Berrange), 
-    - Bug fixes: segfault on virtual network without bridge name (Cole
-           Robinson), various locking fixes (Cole Robinson), fix serial
-          and parallel devices on tcp/unix/telnet (Guido Günther), leak
-+          and parallel devices on tcp/unix/telnet (Guido GÃ¼nther), leak
-           in daemon (Jim Meyering), storage driver segfault (Miloslav TrmaC),
-           missing check in read-only connections (Daniel Berrange),
-           OpenVZ crash and mutex fixes (Anton Protopopov), couple of
-@@ -282,15 +282,15 @@
-    - Improvements: driver infrastructure and locking (Daniel Berrange),
-           Test driver infrastructure (Daniel Berrange), parallelism in the
-           daemon and associated config (Daniel Berrange), virsh help cleanups
-          (Jim Meyering), logrotate daemon logs (Guido Günther), more
-+          (Jim Meyering), logrotate daemon logs (Guido GÃ¼nther), more
-           regression tests (Jim Meyering), QEmu SDL graphics (Itamar Heim),
-           add --version flag to daemon (Dave Allan), memory consumption
-           cleanup (Dave Allan), QEmu pid file and XML states for daemon
-          restart (Guido Günther), gnulib updates (Jim Meyering and
-+          restart (Guido GÃ¼nther), gnulib updates (Jim Meyering and
-           Dan Berrange), PCI passthrough for KVM (Jason Krieg), generic
-           internal thread API (Daniel Berrange), RHEL-5 specific Xen
-           configure option and code (Markus Armbruster), save domain
-          state as string in status file (Guido Günther), add locking
-+          state as string in status file (Guido GÃ¼nther), add locking
-           to all API entry points (Daniel Berrange), new ref counting APIs
-           (Daniel Berrange), IP address for Xen bridges (John Levon),
-           driver format for disk file types (Daniel Berrange), improve
-@@ -303,15 +303,15 @@
-           (Jim Meyering), gethostby* cleanup and test (Jim Meyering), some
-            code fixes (Dave Allan), various code cleanup (Jim Meyering),
-            virsh argument handling cleanup (Jim Meyering), virAsprintf
-           cleanup replacement (Guido Günther), QEmu monitor reads (Cole
-           Robinson), Makefile cleanups (Guido Günther), Xen code cleanups
-+           cleanup replacement (Guido GÃ¼nther), QEmu monitor reads (Cole
-+           Robinson), Makefile cleanups (Guido GÃ¼nther), Xen code cleanups
-            (John Levon), revamp of ELF export scripts (John Levon), domain
-            event callback args (John Levon), enforce use of pid_t (John Levon),
-            virsh pool-*-as XML code merge (Cole Robinson), xgettext warnings
-           (Jim Meyering), add virKillProcess (Guido Günther), add
-+           (Jim Meyering), add virKillProcess (Guido GÃ¼nther), add
-            virGetHostname (David Lutterkort), add flags argument to the full
-           XML parsing stack (Guido Günther), various daemon code cleanups
-           (Guido Günther), handling of daemon missing config file (Jim
-+           XML parsing stack (Guido GÃ¼nther), various daemon code cleanups
-+           (Guido GÃ¼nther), handling of daemon missing config file (Jim
-            Meyering), rpcgen invocation cleanup (Richard Jones), devhelp
-            builkd makefile cleanups (John Levon), update error handling for
-            threading (Daniel Berrange), remove all non-rentrant POSIX calls
-@@ -331,7 +331,7 @@
-    - Bug fixes: add a delay in storage backend for disks to show up
-           (Chris Lalancette), fix parsing for CDRom device with no source
-           (Daniel Berrange), use xenstore to list domains to avoid some
-          bugs (Guido Günther), remove a leak in xen inotify code (Daniel
-+          bugs (Guido GÃ¼nther), remove a leak in xen inotify code (Daniel
-           Berrange), UML driver freeing of uninitialialized variable (Ron
-           Yorston), fix UML inotify code (Daniel Berrange), crash when
-           adding storage without a format (Cole Robinson)
-@@ -339,8 +339,8 @@
-           max memory (Jim Fehlig), allow remote://hostname/ URI for automatic
-           probe of hypervisors (Daniel Berrange), fix daemon configuration
-           regression testing (Jim Meyering ), check /usr/bin/kvm for QEmu
-          driver init (Guido Günther), proper active vs. inactive
-          differentiation (Guido Günther), improve MTU setting on tap
-+          driver init (Guido GÃ¼nther), proper active vs. inactive
-+          differentiation (Guido GÃ¼nther), improve MTU setting on tap
-           interfaces (Eduardo Habkost), increase timeout for initial QEmu
-           monitor poll (Cole Robinson)
-    - Cleanups:fix improper initialisations (Jim Meyering)
-@@ -350,9 +350,9 @@
-    - New features: CPU and scheduler support for LXC (Dan Smith), SDL display configuration (Daniel Berrange), domain lifecycle event support for QEmu and Xen with python bindings (Ben Guthro and Daniel Berrange), KVM/QEmu migration support (Rich Jones and Chris Lalancette), User Mode Linux driver (Daniel Berrange), API for node device enumeration using HAL and DeviceKit with python bindings (David Lively), 
-    - Portability: RHEL build fixes, VPATH build (Guido Gunther), many MinGW related cleanups and fixes (Richard Jones), compilation without libvirtd (Richard Jones), Add a Windows icon (Richard Jones), sys/poll.h portability fixes (Daniel Berrange), gnulib and mingw cleanups (Jim Meyering), 
-    - Documentation: virsh man page cleanups (Mark McLoughlin), doc for NIC model selection (Richard Jones), monitoring section, link to AMQP bindings, inew APIs, UML driver docs (Daniel Berrange), 
-   - Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido Günther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),  
-   - Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido Günther), qemudDomainBlockStats improvement (Guido Günther), scsi/virtio hotplug support for KVM (Guido Günther), USB hot addition in QEmu (Guido Günther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido Günther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)
-   - Cleanups: C99 initializers (Guido Gunther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido Günther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering), 
-+   - Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido GÃ¼nther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),  
-+   - Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido GÃ¼nther), qemudDomainBlockStats improvement (Guido GÃ¼nther), scsi/virtio hotplug support for KVM (Guido GÃ¼nther), USB hot addition in QEmu (Guido GÃ¼nther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido GÃ¼nther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)
-+   - Cleanups: C99 initializers (Guido Gunther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido GÃ¼nther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering), 
- 
- 
- 0.4.6: Sep 23 2008:
-@@ -364,7 +364,7 @@
-           OpenVZ (Evgeniy Sokolov), fix parsing of pool without a source
-           (Chris Lalancette and Daniel Berrange)
-    - Improvements: add storage disk volume delete (Cole Robinson),
-          KVM dynamic max CPU detection (Guido Günther), spec file improvement
-+          KVM dynamic max CPU detection (Guido GÃ¼nther), spec file improvement
-           for minimal builds (Ben Guthro), improved error message in XM
-           configuration module (Richard Jones), network config in OpenVZ
-           support (Evgeniy Sokolov), enable stopping a pool in logical
-@@ -379,7 +379,7 @@
-           unified XML domain and network parsing for all drivers (Daniel
-           Berrange), OpenVZ features improvements (Evgeniy Sokolov),
-           OpenVZ and Linux containers support now default, USB device
-          passthrough for QEmu/KVM (Guido Günther), storage pool source
-+          passthrough for QEmu/KVM (Guido GÃ¼nther), storage pool source
-           discovery (David Lively)
-    - Portability: fixes for MinGW (Atsushi SAKAI and Daniel Berrange),
-           detection of xen lib improvement (David Lively),
-@@ -389,9 +389,9 @@
-           SAKAI and Daniel Berrange), HTML generation fix, -lpthread explicit
-           linking when needed (Jim Meyering)
-    - Documentation: various typo fixes (Anton Protopopov, Toth
-          István, Atsushi SAKAI, Nguyen Anh Quynh),
-+          IstvÃ¡n, Atsushi SAKAI, Nguyen Anh Quynh),
-           Java bindings docs, remove Xen centric
-          comments (Guido Günther), various typo in comments (Chris
-+          comments (Guido GÃ¼nther), various typo in comments (Chris
-           Lalancette), docs and API comments fixes (Charles Duffy),
-           how to contribute to open source link (Richard Jones),
-           memory unit fixups (matthew chan)
-@@ -401,14 +401,14 @@
-           in QEmu/KVM (Daniel Berrange), fix OpenVZ probe function (Evgeniy
-           Sokolov), ID related lookup fixes in OpenVZ (Evgeniy Sokolov),
-           pool cration for netfs (Cole Robinson), check for migrate support
-          with QEmu (Guido Günther), check against double create with QEmu
-          (Guido Günther), broken open failure detection in QEmu (Guido
-          Günther), UUID string conversions in QEmu (Guido Günther),
-+          with QEmu (Guido GÃ¼nther), check against double create with QEmu
-+          (Guido GÃ¼nther), broken open failure detection in QEmu (Guido
-+          GÃ¼nther), UUID string conversions in QEmu (Guido GÃ¼nther),
-           various small cleanup and bug fixes (Daniel Berrange), ID
-           related fixes in the test driver (Daniel Berrange), better error
-           reporting on XML parsing (Daniel Berrange), empty CD-ROM source
-           device section (Chris Lalancette), avoid crashes for interface
-          without a name in QEmu (Guido Günther), provide the real
-+          without a name in QEmu (Guido GÃ¼nther), provide the real
-           vncport (Charles Duffy), fix forward delay (Daniel Berrange),
-           new VM state is initialized to be SHUTOFF (Daniel Berrange),
-           virsh attach-disk bug fixes (Chris Lalancette), veth clash
-@@ -440,7 +440,7 @@
-           (Daniel Berrange), virsh "edit" command (Richard Jones), save
-           UUID of OpenVZ domains (Evgeniy Sokolov), improve xen blocks
-           statistics (Chris Lalancette), gnulib updates (Jim Meyering),
-          allow to add disk as USB devices (Guido Günther), LXC container
-+          allow to add disk as USB devices (Guido GÃ¼nther), LXC container
-           process should survive libvirtd restarts (Daniel Berrange), allow
-           to define static host domain configs, number of CPU used by
-           OpenVZ domains (Evgeniy Sokolov), private root fs for LXC (Daniel
-@@ -572,9 +572,9 @@
-       driver (Cole Robinson), xen and hvm added to test driver capabilities
-       (Cole Robinson)
-    - Code cleanup: remove unused getopt header (Jim Meyering), mark more
-      strings as translatable (Guido Günther and Jim Meyering), convert
-+      strings as translatable (Guido GÃ¼nther and Jim Meyering), convert
-       error strings to something meaningful and translatable (Jim Meyering),
-      Linux Containers code cleanup, last error initializer (Guido Günther)
-+      Linux Containers code cleanup, last error initializer (Guido GÃ¼nther)
- 
- 
- 0.4.1: Mar 3 2008:
-diff --git a/docs/news.xsl b/docs/news.xsl
-index a190120..e35030e 100644
--- a/docs/news.xsl
-+++ b/docs/news.xsl
-@@ -1,7 +1,7 @@
- <?xml version="1.0"?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                 version="1.0">
-  <xsl:output method="text" encoding="ISO-8859-1"/>
-+  <xsl:output method="text" encoding="UTF-8"/>
- 
-   <xsl:template match="/">
-     <xsl:text>
-- 
-1.6.2.5
-
@@ -0,0 +1,225 @@
+Return-Path: alexl@redhat.com
+Received: from zmta04.collab.prod.int.phx2.redhat.com (LHLO
+ zmta04.collab.prod.int.phx2.redhat.com) (10.5.81.11) by
+ zmail20.collab.prod.int.phx2.redhat.com with LMTP; Tue, 9 Oct 2012 11:26:38
+ -0400 (EDT)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+	by zmta04.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D4096D0927
+	for <alexl@mail.corp.redhat.com>; Tue,  9 Oct 2012 11:26:38 -0400 (EDT)
+Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
+	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q99FQV93016417;
+	Tue, 9 Oct 2012 11:26:33 -0400
+From: Alexander Larsson <alexl@redhat.com>
+To: libvir-list@redhat.com
+Cc: Alexander Larsson <alexl@redhat.com>
+Subject: [PATCH 1/2] virdbus: Add virDBusGetSessionBus helper
+Date: Tue,  9 Oct 2012 17:26:28 +0200
+Message-Id: <1349796389-6122-2-git-send-email-alexl@redhat.com>
+In-Reply-To: <1349796389-6122-1-git-send-email-alexl@redhat.com>
+References: <1349796389-6122-1-git-send-email-alexl@redhat.com>
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+
+This splits out some common code from virDBusGetSystemBus and
+uses it to implement a new virDBusGetSessionBus helper.
+---
+ src/libvirt_private.syms |  1 +
+ src/util/virdbus.c       | 84 ++++++++++++++++++++++++++++++++++++------------
+ src/util/virdbus.h       |  1 +
+ 3 files changed, 66 insertions(+), 20 deletions(-)
+
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index a8c81e7..88f1b2f 100644
+--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
+@@ -1310,6 +1310,7 @@ virConsoleOpen;
+ 
+ # virdbus.h
+ virDBusGetSystemBus;
+virDBusGetSessionBus;
+ 
+ 
+ # virdomainlist.h
+diff --git a/src/util/virdbus.c b/src/util/virdbus.c
+index 4acce12..2dc7265 100644
+--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
+@@ -32,40 +32,49 @@
+ #ifdef HAVE_DBUS
+ 
+ static DBusConnection *systembus = NULL;
+-static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER;
+-static DBusError dbuserr;
+static DBusConnection *sessionbus = NULL;
+static virOnceControl systemonce = VIR_ONCE_CONTROL_INITIALIZER;
+static virOnceControl sessiononce = VIR_ONCE_CONTROL_INITIALIZER;
+static DBusError systemdbuserr;
+static DBusError sessiondbuserr;
+ 
+ static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data);
+ static void virDBusRemoveWatch(DBusWatch *watch, void *data);
+ static void virDBusToggleWatch(DBusWatch *watch, void *data);
+ 
+-static void virDBusSystemBusInit(void)
+static DBusConnection *virDBusBusInit(DBusBusType type, DBusError *dbuserr)
+ {
+    DBusConnection *bus;
+
+     /* Allocate and initialize a new HAL context */
+     dbus_connection_set_change_sigpipe(FALSE);
+     dbus_threads_init_default();
+ 
+-    dbus_error_init(&dbuserr);
+-    if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &dbuserr)))
+-        return;
+    dbus_error_init(dbuserr);
+    if (!(bus = dbus_bus_get(type, dbuserr)))
+        return NULL;
+ 
+-    dbus_connection_set_exit_on_disconnect(systembus, FALSE);
+    dbus_connection_set_exit_on_disconnect(bus, FALSE);
+ 
+     /* Register dbus watch callbacks */
+-    if (!dbus_connection_set_watch_functions(systembus,
+    if (!dbus_connection_set_watch_functions(bus,
+                                              virDBusAddWatch,
+                                              virDBusRemoveWatch,
+                                              virDBusToggleWatch,
+-                                             NULL, NULL)) {
+-        systembus = NULL;
+-        return;
+                                             bus, NULL)) {
+        return NULL;
+     }
+    return bus;
+ }
+ 
+static void virDBusSystemBusInit(void)
+{
+    systembus = virDBusBusInit (DBUS_BUS_SYSTEM, &systemdbuserr);
+}
+ 
+ DBusConnection *virDBusGetSystemBus(void)
+ {
+-    if (virOnce(&once, virDBusSystemBusInit) < 0) {
+    if (virOnce(&systemonce, virDBusSystemBusInit) < 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        _("Unable to run one time DBus initializer"));
+         return NULL;
+@@ -74,7 +83,7 @@ DBusConnection *virDBusGetSystemBus(void)
+     if (!systembus) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("Unable to get DBus system bus connection: %s"),
+-                       dbuserr.message ? dbuserr.message : "watch setup failed");
+                       systemdbuserr.message ? systemdbuserr.message : "watch setup failed");
+         return NULL;
+     }
+ 
+@@ -82,13 +91,45 @@ DBusConnection *virDBusGetSystemBus(void)
+ }
+ 
+ 
+static void virDBusSessionBusInit(void)
+{
+    sessionbus = virDBusBusInit (DBUS_BUS_SESSION, &sessiondbuserr);
+}
+
+DBusConnection *virDBusGetSessionBus(void)
+{
+    if (virOnce(&sessiononce, virDBusSessionBusInit) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("Unable to run one time DBus initializer"));
+        return NULL;
+    }
+
+    if (!sessionbus) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unable to get DBus session bus connection: %s"),
+                       sessiondbuserr.message ? sessiondbuserr.message : "watch setup failed");
+        return NULL;
+    }
+
+    return sessionbus;
+}
+
+struct virDBusWatch
+{
+    int watch;
+    DBusConnection *bus;
+};
+
+ static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED,
+                                  int fd ATTRIBUTE_UNUSED,
+                                  int events, void *opaque)
+ {
+     DBusWatch *watch = opaque;
+    struct virDBusWatch *info;
+     int dbus_flags = 0;
+ 
+    info = dbus_watch_get_data(watch);
+
+     if (events & VIR_EVENT_HANDLE_READABLE)
+         dbus_flags |= DBUS_WATCH_READABLE;
+     if (events & VIR_EVENT_HANDLE_WRITABLE)
+@@ -100,7 +141,7 @@ static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED,
+ 
+     (void)dbus_watch_handle(watch, dbus_flags);
+ 
+-    while (dbus_connection_dispatch(systembus) == DBUS_DISPATCH_DATA_REMAINS)
+    while (dbus_connection_dispatch(info->bus) == DBUS_DISPATCH_DATA_REMAINS)
+         /* keep dispatching while data remains */;
+ }
+ 
+@@ -120,18 +161,13 @@ static int virDBusTranslateWatchFlags(int dbus_flags)
+ }
+ 
+ 
+-struct virDBusWatch
+-{
+-    int watch;
+-};
+-
+ static void virDBusWatchFree(void *data) {
+     struct virDBusWatch *info = data;
+     VIR_FREE(info);
+ }
+ 
+ static dbus_bool_t virDBusAddWatch(DBusWatch *watch,
+-                                  void *data ATTRIBUTE_UNUSED)
+                                   void *data)
+ {
+     int flags = 0;
+     int fd;
+@@ -148,6 +184,7 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch,
+ # else
+     fd = dbus_watch_get_fd(watch);
+ # endif
+    info->bus = (DBusConnection *)data;
+     info->watch = virEventAddHandle(fd, flags,
+                                     virDBusWatchCallback,
+                                     watch, NULL);
+@@ -194,4 +231,11 @@ DBusConnection *virDBusGetSystemBus(void)
+     return NULL;
+ }
+ 
+DBusConnection *virDBusGetSessionBus(void)
+{
+    virReportError(VIR_ERR_INTERNAL_ERROR,
+                   "%s", _("DBus support not compiled into this binary"));
+    return NULL;
+}
+
+ #endif /* ! HAVE_DBUS */
+diff --git a/src/util/virdbus.h b/src/util/virdbus.h
+index 27dca00..e443fbe 100644
+--- a/src/util/virdbus.h
+++ b/src/util/virdbus.h
+@@ -30,5 +30,6 @@
+ # include "internal.h"
+ 
+ DBusConnection *virDBusGetSystemBus(void);
+DBusConnection *virDBusGetSessionBus(void);
+ 
+ #endif /* __VIR_DBUS_H__ */
+-- 
+1.7.12.1
+
@@ -0,0 +1,303 @@
+Return-Path: alexl@redhat.com
+Received: from zmta06.collab.prod.int.phx2.redhat.com (LHLO
+ zmta06.collab.prod.int.phx2.redhat.com) (10.5.81.13) by
+ zmail20.collab.prod.int.phx2.redhat.com with LMTP; Tue, 9 Oct 2012 11:26:39
+ -0400 (EDT)
+Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
+	by zmta06.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id D4A8516044F
+	for <alexl@mail.corp.redhat.com>; Tue,  9 Oct 2012 11:26:39 -0400 (EDT)
+Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
+	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q99FQV94016417;
+	Tue, 9 Oct 2012 11:26:34 -0400
+From: Alexander Larsson <alexl@redhat.com>
+To: libvir-list@redhat.com
+Cc: Alexander Larsson <alexl@redhat.com>
+Subject: [PATCH 2/2] Shut down session libvirtd cleanly
+Date: Tue,  9 Oct 2012 17:26:29 +0200
+Message-Id: <1349796389-6122-3-git-send-email-alexl@redhat.com>
+In-Reply-To: <1349796389-6122-1-git-send-email-alexl@redhat.com>
+References: <1349796389-6122-1-git-send-email-alexl@redhat.com>
+X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
+
+When the session dies or when the system is going to be shut down
+we save all active VMs and exit libvirtd.
+
+Additionally whenever there is an active domain we hold a
+shutdown inhibitor to avoid shutting down before all the
+VMs are saved.
+---
+ daemon/libvirtd.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 244 insertions(+)
+
+diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
+index b49acc5..c3bf2ce 100644
+--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
+@@ -98,6 +98,11 @@
+ 
+ #include "configmake.h"
+ 
+#ifdef HAVE_DBUS
+# include <dbus/dbus.h>
+# include "virdbus.h"
+#endif
+
+ #if HAVE_SASL
+ virNetSASLContextPtr saslCtxt = NULL;
+ #endif
+@@ -769,6 +774,212 @@ static int daemonSetupSignals(virNetServerPtr srv)
+     return 0;
+ }
+ 
+#ifdef HAVE_DBUS
+
+static DBusConnection *sessionBus;
+static DBusConnection *systemBus;
+static virConnectPtr sessionConnection;
+static int numActiveDomains;
+static bool hasInhibit;
+static bool callingInhibit;
+static int inhibitFd = -1;
+
+static void runSaveAllDomains(void *opaque)
+{
+    virNetServerPtr srv = opaque;
+    int numDomains, i;
+    int state;
+    virDomainPtr *domains = NULL;
+    unsigned int *flags = NULL;
+
+    numDomains = virConnectListAllDomains(sessionConnection, &domains,  VIR_CONNECT_LIST_DOMAINS_ACTIVE);
+    if (numDomains < 0)
+        goto cleanup;
+
+    if (VIR_ALLOC_N(flags, numDomains) < 0) {
+        virReportOOMError();
+        goto cleanup;
+    }
+
+    /* First we pause all VMs to make them stop dirtying
+       pages, etc. We remember if any VMs were paused so
+       we can restore that on resume. */
+    for (i = 0 ; i < numDomains ; i++) {
+        flags[i] = VIR_DOMAIN_SAVE_RUNNING;
+        if (virDomainGetState (domains[i], &state, NULL, 0) == 0) {
+            if (state == VIR_DOMAIN_PAUSED) {
+                flags[i] = VIR_DOMAIN_SAVE_PAUSED;
+            }
+        }
+        virDomainSuspend (domains[i]);
+    }
+
+    /* Then we save the VMs to disk */
+    for (i = 0 ; i < numDomains ; i++)
+        virDomainManagedSave (domains[i], flags[i]);
+
+    VIR_FREE (domains);
+    VIR_FREE (flags);
+
+ cleanup:
+    if (domains != NULL) {
+        for (i = 0 ; i < numDomains ; i++)
+            virDomainFree (domains[i]);
+        VIR_FREE (domains);
+    }
+    if (flags != NULL)
+        VIR_FREE (flags);
+
+    /* We don't need any shutdown inhibit lock anymore now */
+    if (inhibitFd != -1) {
+        if (VIR_CLOSE (inhibitFd) < 0)
+            virReportSystemError(errno, "%s", _("failed to close file"));
+        inhibitFd = -1;
+    }
+
+    /* Exit libvirtd cleanly */
+    virNetServerQuit (srv);
+}
+
+/* We do this in a thread to not block the main loop */
+static void saveAllDomains(virNetServerPtr srv)
+{
+    virThread thr;
+    virObjectRef(srv);
+    if (virThreadCreate(&thr, false, runSaveAllDomains, srv) < 0) {
+        virObjectUnref(srv);
+    }
+}
+
+static void gotInhibitReply (DBusPendingCall *pending,
+                             void            *opaque ATTRIBUTE_UNUSED)
+{
+    DBusMessage *reply;
+    int fd;
+
+    callingInhibit = false;
+
+    reply = dbus_pending_call_steal_reply (pending);
+    if (reply == NULL)
+        return;
+
+    if (dbus_message_get_args (reply, NULL,
+                                DBUS_TYPE_UNIX_FD, &fd,
+                                DBUS_TYPE_INVALID)) {
+        if (hasInhibit)
+            inhibitFd = fd;
+        else {
+            /* We stopped the last VM since we made the inhibit call */
+            if (VIR_CLOSE (fd) < 0) {
+                virReportSystemError(errno, "%s", _("failed to close file"));
+            }
+        }
+    }
+    dbus_message_unref (reply);
+}
+
+/* As per: http://www.freedesktop.org/wiki/Software/systemd/inhibit */
+static void callInhibit(const char *what,
+                        const char *who,
+                        const char *why,
+                        const char *mode)
+{
+    DBusMessage *message;
+    DBusPendingCall *pendingReply;
+
+    if (systemBus == NULL)
+        return;
+
+    /* Only one outstanding call at a time */
+    if (callingInhibit)
+        return;
+
+    message = dbus_message_new_method_call ("org.freedesktop.login1",
+                                            "/org/freedesktop/login1",
+                                            "org.freedesktop.login1.Manager",
+                                            "Inhibit");
+    if (message == NULL)
+        return;
+
+    dbus_message_append_args (message,
+                              DBUS_TYPE_STRING, &what,
+                              DBUS_TYPE_STRING, &who,
+                              DBUS_TYPE_STRING, &why,
+                              DBUS_TYPE_STRING, &mode,
+                              DBUS_TYPE_INVALID);
+
+    pendingReply = NULL;
+    if (dbus_connection_send_with_reply (systemBus, message,
+                                         &pendingReply,
+                                         25*1000)) {
+        dbus_pending_call_set_notify (pendingReply,
+                                      gotInhibitReply,
+                                      NULL, NULL);
+        callingInhibit = true;
+    }
+    dbus_message_unref (message);
+}
+
+
+static void numActiveDomainsChanged(void)
+{
+    if (numActiveDomains > 0 && !hasInhibit) {
+        callInhibit("shutdown", _("Libvirt"), _("Virtual machines need to be saved"), "delay");
+        hasInhibit = true;
+    } else if (numActiveDomains == 0 && hasInhibit) {
+        if (inhibitFd != -1) {
+            if (VIR_CLOSE (inhibitFd) < 0) {
+                virReportSystemError(errno, "%s", _("failed to close file"));
+            }
+            inhibitFd = -1;
+        }
+        hasInhibit = false;
+    }
+}
+
+static int lifecycleEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
+                                  virDomainPtr dom ATTRIBUTE_UNUSED,
+                                  int event,
+                                  int detail ATTRIBUTE_UNUSED,
+                                  void *opaque ATTRIBUTE_UNUSED)
+{
+    if (event == VIR_DOMAIN_EVENT_STOPPED)
+        numActiveDomains--;
+    else if (event == VIR_DOMAIN_EVENT_STARTED)
+        numActiveDomains++;
+
+    numActiveDomainsChanged();
+
+    return 0;
+}
+
+static DBusHandlerResult handleSessionMessageFunc(DBusConnection  *connection ATTRIBUTE_UNUSED,
+                                                  DBusMessage     *message,
+                                                  void            *userData)
+{
+    virNetServerPtr srv = userData;
+
+    if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+        saveAllDomains (srv);
+    }
+
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
+static DBusHandlerResult handleSystemMessageFunc(DBusConnection  *connection ATTRIBUTE_UNUSED,
+                                                 DBusMessage     *message,
+                                                 void            *userData)
+{
+    virNetServerPtr srv = userData;
+
+    if (dbus_message_is_signal(message, "org.freedesktop.login1.Manager", "PrepareForShutdown")) {
+        saveAllDomains (srv);
+    }
+
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+#endif
+
+ static void daemonRunStateInit(void *opaque)
+ {
+     virNetServerPtr srv = opaque;
+@@ -785,6 +996,39 @@ static void daemonRunStateInit(void *opaque)
+         return;
+     }
+ 
+#ifdef HAVE_DBUS
+    /* Tie the non-priviledged libvirtd to the session/shutdown lifecycle */
+    if (!virNetServerIsPrivileged(srv)) {
+
+        sessionBus = virDBusGetSessionBus ();
+        if (sessionBus != NULL) {
+            dbus_connection_add_filter(sessionBus,
+                                       handleSessionMessageFunc, srv, NULL);
+        }
+
+        systemBus = virDBusGetSystemBus ();
+        if (systemBus != NULL) {
+            dbus_connection_add_filter(systemBus,
+                                       handleSystemMessageFunc, srv, NULL);
+            dbus_bus_add_match(systemBus,
+                               "type='signal',sender='org.freedesktop.login1', interface='org.freedesktop.login1.Manager'",
+                               NULL);
+        }
+
+        sessionConnection = virConnectOpen("qemu:///session");
+        if (sessionConnection != NULL) {
+            numActiveDomains = virConnectNumOfDomains(sessionConnection);
+            virConnectDomainEventRegisterAny(sessionConnection,
+                                             NULL,
+                                             VIR_DOMAIN_EVENT_ID_LIFECYCLE,
+                                             VIR_DOMAIN_EVENT_CALLBACK (lifecycleEventCallback),
+                                             NULL, NULL);
+            numActiveDomainsChanged();
+        }
+
+    }
+#endif
+
+     /* Only now accept clients from network */
+     virNetServerUpdateServices(srv, true);
+     virObjectUnref(srv);
+-- 
+1.7.12.1
+
@@ -1 +1 @@
-7c8008af99963682cb38666d2f1661ba  libvirt-0.7.0-0.1.gitf055724.tar.gz
+56078401a10162674dbd98846d0f607d  libvirt-0.10.2.8.tar.gz