Update of libvirt with the new upstream release, Daniel

.cvsignore

@@ -0,0 +1,19 @@
+libvirt-0.0.3.tar.gz
+libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
+libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz
+libvirt-0.1.5.tar.gz
+libvirt-0.1.6.tar.gz
+libvirt-0.1.7.tar.gz
+libvirt-0.1.8.tar.gz
+libvirt-0.1.9.tar.gz
+libvirt-0.1.10.tar.gz
+libvirt-0.1.11.tar.gz
+libvirt-0.2.0.tar.gz
+libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz

.gitignore

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

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

Makefile

@@ -3,19 +3,4 @@
 NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
+include ../common/Makefile.common

branch

@@ -0,0 +1 @@
+F-7

libvirt-0.2.2-bridge-init.patch

@@ -0,0 +1,17 @@
+diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
+--- libvirt-0.2.2/qemud/conf.c	2007-05-14 10:38:52.000000000 -0400
++++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:38:34.000000000 -0400
+@@ -1151,6 +1151,12 @@ qemudNetworkIfaceConnect(struct qemud_se
+         goto error;
+     }
+ 
++    if (!server->brctl && (err = brInit(&server->brctl))) {
++        qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
++                         "cannot initialize bridge support: %s", strerror(err));
++        goto error;
++    }
++
+     if ((err = brAddTap(server->brctl, brname,
+                         ifname, BR_IFNAME_MAXLEN, &tapfd))) {
+         qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
+Only in libvirt-0.2.2.new/qemud: conf.c.orig

libvirt-0.2.2-disable-xm.patch

@@ -0,0 +1,15 @@
+diff -rup libvirt-0.2.2/src/xen_unified.c libvirt-0.2.2.new/src/xen_unified.c
+--- libvirt-0.2.2/src/xen_unified.c	2007-04-17 04:38:52.000000000 -0400
++++ libvirt-0.2.2.new/src/xen_unified.c	2007-05-01 16:49:54.000000000 -0400
+@@ -112,6 +112,11 @@ xenUnifiedOpen (virConnectPtr conn, cons
+     for (i = 0; i < nb_drivers; ++i) {
+         int failed_to_open = 1;
+ 
++        /* Only use XM driver for Xen <= 3.0.3 (ie xendConfigVersion <= 2) */
++        if (drivers[i] == &xenXMDriver &&
++            priv->xendConfigVersion > 2)
++            continue;
++
+         /* Ignore proxy for root */
+         if (i == proxy_offset && getuid() == 0)
+             continue;

libvirt-0.2.2-dnsmasq-order.patch

@@ -0,0 +1,23 @@
+diff -rup libvirt-0.2.2/qemud/qemud.c libvirt-0.2.2.new/qemud/qemud.c
+--- libvirt-0.2.2/qemud/qemud.c	2007-04-11 10:13:36.000000000 -0400
++++ libvirt-0.2.2.new/qemud/qemud.c	2007-05-01 16:51:15.000000000 -0400
+@@ -1110,6 +1110,7 @@ qemudBuildDnsmasqArgv(struct qemud_serve
+     len =
+         1 + /* dnsmasq */
+         1 + /* --keep-in-foreground */
++        1 + /* --strict-order */
+         1 + /* --bind-interfaces */
+         2 + /* --pid-file "" */
+         2 + /* --conf-file "" */
+@@ -1133,6 +1134,11 @@ qemudBuildDnsmasqArgv(struct qemud_serve
+     APPEND_ARG(*argv, i++, "dnsmasq");
+ 
+     APPEND_ARG(*argv, i++, "--keep-in-foreground");
++    /*
++     * Needed to ensure dnsmasq uses same algorithm for processing
++     * multiple nameserver entries in /etc/resolv.conf as GLibC.
++     */
++    APPEND_ARG(*argv, i++, "--strict-order");
+     APPEND_ARG(*argv, i++, "--bind-interfaces");
+ 
+     APPEND_ARG(*argv, i++, "--pid-file");

libvirt-0.2.2-graphics-hvm.patch

@@ -0,0 +1,70 @@
+diff -rup libvirt-0.2.2.new/src/xend_internal.c libvirt-0.2.2/src/xend_internal.c
+--- libvirt-0.2.2.new/src/xend_internal.c	2007-04-15 16:09:10.000000000 -0400
++++ libvirt-0.2.2/src/xend_internal.c	2007-05-03 14:52:42.000000000 -0400
+@@ -1676,35 +1676,38 @@ xend_parse_sexp_desc(virConnectPtr conn,
+         }
+     }
+ 
+-    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.4) vnc config */
+-    tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
+-    if (tmp != NULL) {
+-        if (tmp[0] == '1') {
+-            int port = xenStoreDomainGetVNCPort(conn, domid);
+-            const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
+-            const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
+-            /* For Xen >= 3.0.3, don't generate a fixed port mapping
+-             * because it will almost certainly be wrong ! Just leave
+-             * it as -1 which lets caller see that the VNC server isn't
+-             * present yet. Subsquent dumps of the XML will eventually
+-             * find the port in XenStore once VNC server has started
+-             */
+-            if (port == -1 && xendConfigVersion < 2)
+-                port = 5900 + domid;
+-            virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
+-            if (listenAddr)
+-                virBufferVSprintf(&buf, " listen='%s'", listenAddr);
+-            if (keymap)
+-                virBufferVSprintf(&buf, " keymap='%s'", keymap);
+-            virBufferAdd(&buf, "/>\n", 3);
++    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
++    if ((hvm && xendConfigVersion < 4) ||
++        (!hvm && xendConfigVersion < 3)) {
++        tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
++        if (tmp != NULL) {
++            if (tmp[0] == '1') {
++                int port = xenStoreDomainGetVNCPort(conn, domid);
++                const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
++                const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
++                /* For Xen >= 3.0.3, don't generate a fixed port mapping
++                 * because it will almost certainly be wrong ! Just leave
++                 * it as -1 which lets caller see that the VNC server isn't
++                 * present yet. Subsquent dumps of the XML will eventually
++                 * find the port in XenStore once VNC server has started
++                 */
++                if (port == -1 && xendConfigVersion < 2)
++                    port = 5900 + domid;
++                virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
++                if (listenAddr)
++                    virBufferVSprintf(&buf, " listen='%s'", listenAddr);
++                if (keymap)
++                    virBufferVSprintf(&buf, " keymap='%s'", keymap);
++                virBufferAdd(&buf, "/>\n", 3);
++            }
+         }
+-    }
+ 
+-    /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
+-    tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
+-    if (tmp != NULL) {
+-        if (tmp[0] == '1')
+-            virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
++        /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
++        tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
++        if (tmp != NULL) {
++            if (tmp[0] == '1')
++                virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
++        }
+     }
+ 
+     tty = xenStoreDomainGetConsolePath(conn, domid);
+Only in libvirt-0.2.2/src: xend_internal.c.orig

libvirt-0.2.2-qemu-noreboot.patch

@@ -0,0 +1,128 @@
+diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
+--- libvirt-0.2.2/qemud/conf.c	2007-04-17 04:34:42.000000000 -0400
++++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:36:12.000000000 -0400
+@@ -245,21 +245,25 @@ static int qemudExtractVersionInfo(const
+     cleanup1:
+         _exit(-1); /* Just in case */
+     } else { /* Parent */
+-        char help[4096]; /* Ought to be enough to hold QEMU help screen */
+-        int got, ret = -1;
++        char help[8192]; /* Ought to be enough to hold QEMU help screen */
++        int got = 0, ret = -1;
+         int major, minor, micro;
+ 
+         if (close(newstdout[1]) < 0)
+             goto cleanup2;
+ 
+-    reread:
+-        if ((got = read(newstdout[0], help, sizeof(help)-1)) < 0) {
+-            if (errno == EINTR)
+-                goto reread;
+-            goto cleanup2;
++        while (got < (sizeof(help)-1)) {
++            int len;
++            if ((len = read(newstdout[0], help+got, sizeof(help)-got-1)) <= 0) {
++                if (!len)
++                    break;
++                if (errno == EINTR)
++                    continue;
++                goto cleanup2;
++            }
++            got += len;
+         }
+         help[got] = '\0';
+-
+         if (sscanf(help, "QEMU PC emulator version %d.%d.%d", &major,&minor, &micro) != 3) {
+             goto cleanup2;
+         }
+@@ -267,6 +271,8 @@ static int qemudExtractVersionInfo(const
+         *version = (major * 1000 * 1000) + (minor * 1000) + micro;
+         if (strstr(help, "-no-kqemu"))
+             *flags |= QEMUD_CMD_FLAG_KQEMU;
++        if (strstr(help, "-no-reboot"))
++            *flags |= QEMUD_CMD_FLAG_NO_REBOOT;
+         if (*version >= 9000)
+             *flags |= QEMUD_CMD_FLAG_VNC_COLON;
+         ret = 0;
+@@ -858,6 +864,22 @@ static struct qemud_vm_def *qemudParseXM
+     }
+     xmlXPathFreeObject(obj);
+ 
++
++    /* See if we disable reboots */
++    obj = xmlXPathEval(BAD_CAST "string(/domain/on_reboot)", ctxt);
++    if ((obj == NULL) || (obj->type != XPATH_STRING) ||
++        (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
++        def->noReboot = 0;
++    } else {
++        if (!strcmp((char*)obj->stringval, "destroy"))
++            def->noReboot = 1;
++        else
++            def->noReboot = 0;
++    }
++    if (obj)
++        xmlXPathFreeObject(obj);
++
++
+     /* Extract OS type info */
+     obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1])", ctxt);
+     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
+@@ -1220,6 +1242,8 @@ int qemudBuildCommandLine(struct qemud_s
+         2 + /* cpus */
+         2 + /* boot device */
+         2 + /* monitor */
++        (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
++         vm->def->noReboot ? 1 : 0) + /* no-reboot */
+         (vm->def->features & QEMUD_FEATURE_ACPI ? 0 : 1) + /* acpi */
+         (vm->def->os.kernel[0] ? 2 : 0) + /* kernel */
+         (vm->def->os.initrd[0] ? 2 : 0) + /* initrd */
+@@ -1255,6 +1279,11 @@ int qemudBuildCommandLine(struct qemud_s
+         goto no_memory;
+     if (!((*argv)[++n] = strdup("pty")))
+         goto no_memory;
++    if (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
++        vm->def->noReboot) {
++        if (!((*argv)[++n] = strdup("-no-reboot")))
++            goto no_memory;
++    }
+ 
+     if (!(vm->def->features & QEMUD_FEATURE_ACPI)) {
+         if (!((*argv)[++n] = strdup("-no-acpi")))
+@@ -2517,6 +2546,17 @@ char *qemudGenerateXML(struct qemud_serv
+             goto no_memory;
+     }
+ 
++    if (bufferAdd(buf, "  <on_poweroff>destroy</on_poweroff>\n", -1) < 0)
++        goto no_memory;
++    if (def->noReboot) {
++        if (bufferAdd(buf, "  <on_reboot>destroy</on_reboot>\n", -1) < 0)
++            goto no_memory;
++    } else {
++        if (bufferAdd(buf, "  <on_reboot>restart</on_reboot>\n", -1) < 0)
++            goto no_memory;
++    }
++    if (bufferAdd(buf, "  <on_crash>destroy</on_crash>\n", -1) < 0)
++        goto no_memory;
+ 
+     if (bufferAdd(buf, "  <devices>\n", -1) < 0)
+         goto no_memory;
+diff -rup libvirt-0.2.2/qemud/internal.h libvirt-0.2.2.new/qemud/internal.h
+--- libvirt-0.2.2/qemud/internal.h	2007-04-11 10:13:36.000000000 -0400
++++ libvirt-0.2.2.new/qemud/internal.h	2007-05-14 10:36:02.000000000 -0400
+@@ -161,6 +161,7 @@ enum qemud_vm_grapics_type {
+ enum qemud_cmd_flags {
+     QEMUD_CMD_FLAG_KQEMU = 1,
+     QEMUD_CMD_FLAG_VNC_COLON = 2,
++    QEMUD_CMD_FLAG_NO_REBOOT = 4,
+ };
+ 
+ 
+@@ -191,6 +192,8 @@ struct qemud_vm_def {
+     int maxmem;
+     int vcpus;
+ 
++    int noReboot;
++
+     struct qemud_vm_os_def os;
+ 
+     int features;

libvirt-0.2.2-sync-daemon-restart.patch

@@ -0,0 +1,19 @@
+--- libvirt-0.2.2/ChangeLog.sync-restart	2007-05-02 13:07:21.719425000 -0400
++++ libvirt-0.2.2/ChangeLog	2007-05-02 13:08:23.204879000 -0400
+@@ -0,0 +1,5 @@
++Wed May  2 17:55:12 IST 2007 Mark McLoughlin <markmc@redhat.com>
++
++	* qemud/libvirtd.in: synchronously restart the daemon in
++	order to avoid https://bugzilla.redhat.com/238492
++	
+--- libvirt-0.2.2/qemud/libvirtd.in.sync-restart	2007-02-23 07:50:58.000000000 -0500
++++ libvirt-0.2.2/qemud/libvirtd.in	2007-05-02 13:08:23.209868000 -0400
+@@ -34,7 +34,7 @@
+ stop() {
+     echo -n $"Stopping $SERVICE daemon: "
+ 
+-    killproc $PROCESS -TERM
++    killproc $PROCESS
+     RETVAL=$?
+     echo
+     if [ $RETVAL -eq 0 ]; then

sources

@@ -1 +1 @@
-05f461cd499c628ef07822dd607c340a  libvirt-1.2.13.2.tar.gz
+3b9e192de1777c8ec801d16cbf1c7819  libvirt-0.2.3.tar.gz