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)

0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch

@@ -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
+

0001-schema-interleave-domain-name-and-uuid-with-other-el.patch

@@ -1,38 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Thu, 17 Dec 2015 13:43:58 +0100
-Subject: [PATCH] schema: interleave domain name and uuid with other elements
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Allow <name> and <uuid> anywhere under <domain>, not just at the top:
-
-error:XML document failed to validate against schema: Unable to validate
-doc against /usr/share/libvirt/schemas/domain.rng
-Expecting an element name, got nothing
-Invalid sequence in interleave
-Element domain failed to validate content
-
-Introduced with the first RelaxNG schema in commit c642103.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1292131
-(cherry picked from commit b4e0549febe416ffefc16f389423740d6d65fa74)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- docs/schemas/domaincommon.rng | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index b252a17..48610ce 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -30,8 +30,8 @@
-   <define name="domain">
-     <element name="domain">
-       <ref name="hvs"/>
--      <ref name="ids"/>
-       <interleave>
-+        <ref name="ids"/>
-         <optional>
-           <ref name="title"/>
-         </optional>

0002-leaseshelper-fix-crash-when-no-mac-is-specified.patch

@@ -1,32 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Thu, 14 Jan 2016 14:31:17 +0100
-Subject: [PATCH] leaseshelper: fix crash when no mac is specified
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If dnsmasq specified DNSMASQ_IAID (so we're dealing with an IPv6
-lease) but no DNSMASQ_MAC, we skip creation of the new lease object.
-
-Also skip adding it to the leases array.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1202350
-(cherry picked from commit df9fe124d650bc438c531673492569da87523d20)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- src/network/leaseshelper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
-index 2d528f7..6930310 100644
---- a/src/network/leaseshelper.c
-+++ b/src/network/leaseshelper.c
-@@ -439,7 +439,7 @@ main(int argc, char **argv)
- 
-     case VIR_LEASE_ACTION_OLD:
-     case VIR_LEASE_ACTION_ADD:
--        if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) {
-+        if (lease_new && virJSONValueArrayAppend(leases_array_new, lease_new) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("failed to create json"));
-             goto cleanup;

0003-build-predictably-generate-systemtap-tapsets-bz-1173.patch

@@ -1,63 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Tue, 19 Jan 2016 22:19:56 -0500
-Subject: [PATCH] build: predictably generate systemtap tapsets (bz 1173641)
-
-The generated output is dependent on perl hashtable ordering, which
-gives different results for i686 and x86_64. Fix this by sorting
-the hash keys before iterating over them
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1173641
-(cherry picked from commit a1edb05c6028470aa24b74aa0f8d5fb5a181128a)
----
- src/rpc/gensystemtap.pl | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl
-index 2467300..7b80fbf 100755
---- a/src/rpc/gensystemtap.pl
-+++ b/src/rpc/gensystemtap.pl
-@@ -72,7 +72,7 @@ function libvirt_rpc_auth_name(type, verbose)
- {
- EOF
- my $first = 1;
--foreach my $type (keys %auth) {
-+foreach my $type (sort(keys %auth)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (type == ", $type, ") {\n";
-@@ -95,7 +95,7 @@ function libvirt_rpc_type_name(type, verbose)
- {
- EOF
- $first = 1;
--foreach my $type (keys %type) {
-+foreach my $type (sort(keys %type)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (type == ", $type, ") {\n";
-@@ -118,7 +118,7 @@ function libvirt_rpc_status_name(status, verbose)
- {
- EOF
- $first = 1;
--foreach my $status (keys %status) {
-+foreach my $status (sort(keys %status)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (status == ", $status, ") {\n";
-@@ -141,7 +141,7 @@ function libvirt_rpc_program_name(program, verbose)
- {
- EOF
- $first = 1;
--foreach my $prog (keys %funcs) {
-+foreach my $prog (sort(keys %funcs)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (program == ", $funcs{$prog}->{id}, ") {\n";
-@@ -165,7 +165,7 @@ function libvirt_rpc_procedure_name(program, version, proc, verbose)
- {
- EOF
- $first = 1;
--foreach my $prog (keys %funcs) {
-+foreach my $prog (sort(keys %funcs)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (program == ", $funcs{$prog}->{id}, " && version == ", $funcs{$prog}->{version}, ") {\n";

0004-rpc-ensure-daemon-is-spawn-even-if-dead-socket-exist.patch

@@ -1,30 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Fri, 3 Jul 2015 16:51:56 +0100
-Subject: [PATCH] rpc: ensure daemon is spawn even if dead socket exists
-
-The auto-spawn code would originally attempt to spawn the
-daemon for both ENOENT and ECONNREFUSED errors from connect().
-The various refactorings eventually lost this so we only
-spawn the daemon on ENOENT. The result is if the daemon exits
-uncleanly, so that the socket is left in the filesystem, we
-will never be able to auto-spawn the daemon again.
-
-(cherry picked from commit 406ee8c226d2197ba1aaecb9cf3ad2b6df31ae44)
----
- src/rpc/virnetsocket.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 51f94d4..6153e0e 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -610,7 +610,8 @@ int virNetSocketNewConnectUNIX(const char *path,
- 
-     while (retries &&
-            connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) {
--        if (!(spawnDaemon && errno == ENOENT)) {
-+        if (!(spawnDaemon && (errno == ENOENT ||
-+                              errno == ECONNREFUSED))) {
-             virReportSystemError(errno, _("Failed to connect socket to '%s'"),
-                                  path);
-             goto cleanup;

0005-rpc-socket-Minor-cleanups.patch

@@ -1,48 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 11 Jan 2016 20:01:24 -0500
-Subject: [PATCH] rpc: socket: Minor cleanups
-
-- Add some debugging
-- Make the loop dependent only on retries
-- Make it explicit that connect(2) success exits the loop
-- Invert the error checking logic
-
-(cherry picked from commit f102c7146ed7f6e04af0ad3bce302476239f2502)
----
- src/rpc/virnetsocket.c | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 6153e0e..dcff69e 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -548,6 +548,9 @@ int virNetSocketNewConnectUNIX(const char *path,
-     char *rundir = NULL;
-     int ret = -1;
- 
-+    VIR_DEBUG("path=%s spawnDaemon=%d binary=%s", path, spawnDaemon,
-+        NULLSTR(binary));
-+
-     memset(&localAddr, 0, sizeof(localAddr));
-     memset(&remoteAddr, 0, sizeof(remoteAddr));
- 
-@@ -608,10 +611,15 @@ int virNetSocketNewConnectUNIX(const char *path,
-     if (remoteAddr.data.un.sun_path[0] == '@')
-         remoteAddr.data.un.sun_path[0] = '\0';
- 
--    while (retries &&
--           connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) {
--        if (!(spawnDaemon && (errno == ENOENT ||
--                              errno == ECONNREFUSED))) {
-+    while (retries) {
-+        if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) == 0) {
-+            VIR_DEBUG("connect() succeeded");
-+            break;
-+        }
-+        VIR_DEBUG("connect() failed: retries=%d errno=%d", retries, errno);
-+
-+        if (!spawnDaemon ||
-+            (errno != ENOENT && errno != ECONNREFUSED)) {
-             virReportSystemError(errno, _("Failed to connect socket to '%s'"),
-                                  path);
-             goto cleanup;

0006-rpc-socket-Explicitly-error-if-we-exceed-retry-count.patch

@@ -1,40 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 11 Jan 2016 20:08:45 -0500
-Subject: [PATCH] rpc: socket: Explicitly error if we exceed retry count
-
-When we autolaunch libvirtd for session URIs, we spin in a retry
-loop waiting for the daemon to start and the connect(2) to succeed.
-
-However if we exceed the retry count, we don't explicitly raise an
-error, which can yield a slew of different error messages elsewhere
-in the code.
-
-Explicitly raise the last connect(2) failure if we run out of retries.
-
-(cherry picked from commit 8da02d528068942303923fc4f935e77cccac9c7c)
----
- src/rpc/virnetsocket.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index dcff69e..90951be 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -618,7 +618,9 @@ int virNetSocketNewConnectUNIX(const char *path,
-         }
-         VIR_DEBUG("connect() failed: retries=%d errno=%d", retries, errno);
- 
-+        retries--;
-         if (!spawnDaemon ||
-+            retries == 0 ||
-             (errno != ENOENT && errno != ECONNREFUSED)) {
-             virReportSystemError(errno, _("Failed to connect socket to '%s'"),
-                                  path);
-@@ -628,7 +630,6 @@ int virNetSocketNewConnectUNIX(const char *path,
-         if (virNetSocketForkDaemon(binary) < 0)
-             goto cleanup;
- 
--        retries--;
-         usleep(5000);
-     }
- 

0007-rpc-socket-Don-t-repeatedly-attempt-to-launch-daemon.patch

@@ -1,43 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 11 Jan 2016 20:13:38 -0500
-Subject: [PATCH] rpc: socket: Don't repeatedly attempt to launch daemon
-
-On every socket connect(2) attempt we were re-launching session
-libvirtd, up to 100 times in 5 seconds.
-
-This understandably caused some weird load races and intermittent
-qemu:///session startup failures
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1271183
-(cherry picked from commit 2eb7a975756d05a5b54ab4acf60083beb6161ac6)
----
- src/rpc/virnetsocket.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 90951be..2ee4b6e 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -547,6 +547,7 @@ int virNetSocketNewConnectUNIX(const char *path,
-     virSocketAddr remoteAddr;
-     char *rundir = NULL;
-     int ret = -1;
-+    bool daemonLaunched = false;
- 
-     VIR_DEBUG("path=%s spawnDaemon=%d binary=%s", path, spawnDaemon,
-         NULLSTR(binary));
-@@ -627,8 +628,12 @@ int virNetSocketNewConnectUNIX(const char *path,
-             goto cleanup;
-         }
- 
--        if (virNetSocketForkDaemon(binary) < 0)
--            goto cleanup;
-+        if (!daemonLaunched) {
-+            if (virNetSocketForkDaemon(binary) < 0)
-+                goto cleanup;
-+
-+            daemonLaunched = true;
-+        }
- 
-         usleep(5000);
-     }

0008-security-Do-not-restore-kernel-and-initrd-labels.patch

@@ -1,57 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 15 Jan 2016 10:55:58 +0100
-Subject: [PATCH] security: Do not restore kernel and initrd labels
-
-Kernel/initrd files are essentially read-only shareable images and thus
-should be handled in the same way. We already use the appropriate label
-for kernel/initrd files when starting a domain, but when a domain gets
-destroyed we would remove the labels which would make other running
-domains using the same files very unhappy.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=921135
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 68acc701bd449481e3206723c25b18fcd3d261b7)
----
- src/security/security_dac.c     | 8 --------
- src/security/security_selinux.c | 8 --------
- 2 files changed, 16 deletions(-)
-
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index deb6980..d01215f 100644
---- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -971,14 +971,6 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
-         virSecurityDACRestoreSecurityFileLabel(def->os.loader->nvram) < 0)
-         rc = -1;
- 
--    if (def->os.kernel &&
--        virSecurityDACRestoreSecurityFileLabel(def->os.kernel) < 0)
--        rc = -1;
--
--    if (def->os.initrd &&
--        virSecurityDACRestoreSecurityFileLabel(def->os.initrd) < 0)
--        rc = -1;
--
-     if (def->os.dtb &&
-         virSecurityDACRestoreSecurityFileLabel(def->os.dtb) < 0)
-         rc = -1;
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 6e67a86..2475a80 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -1953,14 +1953,6 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
-         virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.loader->nvram) < 0)
-         rc = -1;
- 
--    if (def->os.kernel &&
--        virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.kernel) < 0)
--        rc = -1;
--
--    if (def->os.initrd &&
--        virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.initrd) < 0)
--        rc = -1;
--
-     if (def->os.dtb &&
-         virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.dtb) < 0)
-         rc = -1;

0009-rpc-wait-longer-for-session-daemon-to-start-up.patch

@@ -1,37 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Tue, 15 Mar 2016 17:04:32 -0400
-Subject: [PATCH] rpc: wait longer for session daemon to start up
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1271183
-
-We only wait 0.5 seconds for the session daemon to start up and present
-its socket, which isn't sufficient for many users. Bump up the sleep
-interval and retry amount so we wait for a total of 5.0 seconds.
-
-(cherry picked from commit ca0c06f4008154de55e0b3109885facd0bf02d32)
----
- src/rpc/virnetsocket.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 2ee4b6e..275f1f5 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -542,7 +542,7 @@ int virNetSocketNewConnectUNIX(const char *path,
-     char *lockpath = NULL;
-     int lockfd = -1;
-     int fd = -1;
--    int retries = 100;
-+    int retries = 500;
-     virSocketAddr localAddr;
-     virSocketAddr remoteAddr;
-     char *rundir = NULL;
-@@ -635,7 +635,7 @@ int virNetSocketNewConnectUNIX(const char *path,
-             daemonLaunched = true;
-         }
- 
--        usleep(5000);
-+        usleep(10000);
-     }
- 
-     localAddr.len = sizeof(localAddr.data);

0010-driver-log-missing-modules-as-INFO-not-WARN.patch

@@ -1,27 +0,0 @@
-From: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
-Date: Thu, 17 Mar 2016 20:02:20 +0100
-Subject: [PATCH] driver: log missing modules as INFO, not WARN
-
-Missing modules is a common expected scenario for most libvirt usage on
-RPM distributions like Fedora, so it doesn't really warrant logging at
-WARN level. Use INFO instead
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1274849
-(cherry picked from commit 9a0c7f5f834185db9017c34aabc03ad99cf37bed)
----
- src/driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/driver.c b/src/driver.c
-index db03438..f926fe4 100644
---- a/src/driver.c
-+++ b/src/driver.c
-@@ -62,7 +62,7 @@ virDriverLoadModule(const char *name)
-         return NULL;
- 
-     if (access(modfile, R_OK) < 0) {
--        VIR_WARN("Module %s not accessible", modfile);
-+        VIR_INFO("Module %s not accessible", modfile);
-         goto cleanup;
-     }
- 

0011-polkit-Allow-password-less-access-for-libvirt-group.patch

@@ -1,126 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Tue, 28 Apr 2015 17:38:00 -0400
-Subject: [PATCH] polkit: Allow password-less access for 'libvirt' group
-
-Many users, who admin their own machines, want to be able to access
-system libvirtd via tools like virt-manager without having to enter
-a root password. Just google 'virt-manager without password' and
-you'll find many hits. I've read at least 5 blog posts over the years
-describing slightly different ways of achieving this goal.
-
-Let's finally add official support for this.
-
-Install a polkit-1 rules file granting password-less auth for any user
-in the new 'libvirt' group. Create the group on RPM install
-
-https://bugzilla.redhat.com/show_bug.cgi?id=957300
-(cherry picked from commit e94979e901517af9fdde358d7b7c92cc055dd50c)
----
- daemon/Makefile.am   | 13 +++++++++++++
- daemon/libvirt.rules |  9 +++++++++
- libvirt.spec.in      | 15 +++++++++++++--
- 3 files changed, 35 insertions(+), 2 deletions(-)
- create mode 100644 daemon/libvirt.rules
-
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index b95a79d..9c5ea37 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -53,6 +53,7 @@ EXTRA_DIST =						\
- 	libvirtd.init.in				\
- 	libvirtd.upstart				\
- 	libvirtd.policy.in				\
-+	libvirt.rules					\
- 	libvirtd.sasl					\
- 	libvirtd.service.in				\
- 	libvirtd.socket.in				\
-@@ -233,6 +234,8 @@ policyauth = auth_admin_keep_session
- else ! WITH_POLKIT0
- policydir = $(datadir)/polkit-1/actions
- policyauth = auth_admin_keep
-+rulesdir = $(datadir)/polkit-1/rules.d
-+rulesfile = libvirt.rules
- endif ! WITH_POLKIT0
- endif WITH_POLKIT
- 
-@@ -263,9 +266,19 @@ if WITH_POLKIT
- install-data-polkit::
- 	$(MKDIR_P) $(DESTDIR)$(policydir)
- 	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-+if ! WITH_POLKIT0
-+	$(MKDIR_P) $(DESTDIR)$(rulesdir)
-+	$(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.rules
-+endif ! WITH_POLKIT0
-+
- uninstall-data-polkit::
- 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- 	rmdir $(DESTDIR)$(policydir) || :
-+if ! WITH_POLKIT0
-+	rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules
-+	rmdir $(DESTDIR)$(rulesdir) || :
-+endif ! WITH_POLKIT0
-+
- else ! WITH_POLKIT
- install-data-polkit::
- uninstall-data-polkit::
-diff --git a/daemon/libvirt.rules b/daemon/libvirt.rules
-new file mode 100644
-index 0000000..01a15fa
---- /dev/null
-+++ b/daemon/libvirt.rules
-@@ -0,0 +1,9 @@
-+// Allow any user in the 'libvirt' group to connect to system libvirtd
-+// without entering a password.
-+
-+polkit.addRule(function(action, subject) {
-+    if (action.id == "org.libvirt.unix.manage" &&
-+        subject.isInGroup("libvirt")) {
-+        return polkit.Result.YES;
-+    }
-+});
-diff --git a/libvirt.spec.in b/libvirt.spec.in
-index dc327a2..a23629d 100644
---- a/libvirt.spec.in
-+++ b/libvirt.spec.in
-@@ -1631,9 +1631,9 @@ then
- fi
- 
- %if %{with_libvirtd}
-+%pre daemon
-     %if ! %{with_driver_modules}
-         %if %{with_qemu}
--%pre daemon
-             %if 0%{?fedora} || 0%{?rhel} >= 6
- # We want soft static allocation of well-known ids, as disk images
- # are commonly shared across NFS mounts by id rather than name; see
-@@ -1647,11 +1647,21 @@ if ! getent passwd qemu >/dev/null; then
-     useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
-   fi
- fi
--exit 0
-             %endif
-         %endif
-     %endif
- 
-+    %if %{with_polkit}
-+        %if 0%{?fedora} || 0%{?rhel} >= 6
-+# 'libvirt' group is just to allow password-less polkit access to
-+# libvirtd. The uid number is irrelevant, so we use dynamic allocation
-+# described at the above link.
-+getent group libvirt >/dev/null || groupadd -r libvirt
-+        %endif
-+    %endif
-+
-+exit 0
-+
- %post daemon
- 
-     %if %{with_systemd}
-@@ -1925,6 +1935,7 @@ exit 0
-         %if 0%{?fedora} || 0%{?rhel} >= 6
- %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
- %{_datadir}/polkit-1/actions/org.libvirt.api.policy
-+%{_datadir}/polkit-1/rules.d/50-libvirt.rules
-         %else
- %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
-         %endif

libvirt-dbus.patch

@@ -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
+

libvirt-save-with-session.patch

@@ -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
+

sources

@@ -1 +1 @@
-05f461cd499c628ef07822dd607c340a  libvirt-1.2.13.2.tar.gz
+56078401a10162674dbd98846d0f607d  libvirt-0.10.2.8.tar.gz