- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
Fix timeout when autostarting session daemon

.cvsignore

@@ -3,4 +3,4 @@
 i686
 x86_64
 libvirt-*.tar.gz
-libvirt-0.4.6.tar.gz
+libvirt-0.6.0.tar.gz

branch

@@ -1 +0,0 @@
-F-10

libvirt-0.6.0-autostart-timeout.patch

@@ -0,0 +1,21 @@
+diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c
+--- libvirt-0.6.0.orig/src/remote_internal.c	2009-02-18 10:56:34.000000000 +0000
++++ libvirt-0.6.0.new/src/remote_internal.c	2009-02-18 13:35:26.000000000 +0000
+@@ -654,12 +654,13 @@ doRemoteOpen (virConnectPtr conn,
+              */
+             if (errno == ECONNREFUSED &&
+                 flags & VIR_DRV_OPEN_REMOTE_AUTOSTART &&
+-                trials < 5) {
++                trials < 20) {
+                 close(priv->sock);
+                 priv->sock = -1;
+-                if (remoteForkDaemon(conn) == 0) {
++                if (trials > 0 ||
++                    remoteForkDaemon(conn) == 0) {
+                     trials++;
+-                    usleep(5000 * trials * trials);
++                    usleep(1000 * 100 * trials);
+                     goto autostart_retry;
+                 }
+             }
+Only in libvirt-0.6.0.new/src: remote_internal.c~

libvirt-0.6.0-dbus-threads.patch

@@ -0,0 +1,44 @@
+diff -rup libvirt-0.6.0.orig/qemud/qemud.c libvirt-0.6.0.new/qemud/qemud.c
+--- libvirt-0.6.0.orig/qemud/qemud.c	2009-02-18 10:56:34.000000000 +0000
++++ libvirt-0.6.0.new/qemud/qemud.c	2009-02-18 12:52:18.000000000 +0000
+@@ -860,6 +860,10 @@ static struct qemud_server *qemudNetwork
+     if (auth_unix_rw == REMOTE_AUTH_POLKIT ||
+         auth_unix_ro == REMOTE_AUTH_POLKIT) {
+         DBusError derr;
++
++        dbus_connection_set_change_sigpipe(FALSE);
++        dbus_threads_init_default();
++
+         dbus_error_init(&derr);
+         server->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr);
+         if (!(server->sysbus)) {
+@@ -868,6 +872,7 @@ static struct qemud_server *qemudNetwork
+             dbus_error_free(&derr);
+             goto cleanup;
+         }
++        dbus_connection_set_exit_on_disconnect(server->sysbus, FALSE);
+     }
+ #endif
+ 
+diff -rup libvirt-0.6.0.orig/src/node_device_hal.c libvirt-0.6.0.new/src/node_device_hal.c
+--- libvirt-0.6.0.orig/src/node_device_hal.c	2009-01-16 12:44:22.000000000 +0000
++++ libvirt-0.6.0.new/src/node_device_hal.c	2009-02-18 12:52:48.000000000 +0000
+@@ -685,6 +685,9 @@ static int halDeviceMonitorStartup(void)
+     nodeDeviceLock(driverState);
+ 
+     /* Allocate and initialize a new HAL context */
++    dbus_connection_set_change_sigpipe(FALSE);
++    dbus_threads_init_default();
++
+     dbus_error_init(&err);
+     hal_ctx = libhal_ctx_new();
+     if (hal_ctx == NULL) {
+@@ -696,6 +699,8 @@ static int halDeviceMonitorStartup(void)
+         fprintf(stderr, "%s: dbus_bus_get failed\n", __FUNCTION__);
+         goto failure;
+     }
++    dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE);
++
+     if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) {
+         fprintf(stderr, "%s: libhal_ctx_set_dbus_connection failed\n",
+                 __FUNCTION__);

libvirt-0.6.0-qemu-startup.patch

@@ -0,0 +1,109 @@
+diff -rup libvirt-0.6.0.orig/src/qemu_driver.c libvirt-0.6.0.new/src/qemu_driver.c
+--- libvirt-0.6.0.orig/src/qemu_driver.c	2009-01-31 09:04:18.000000000 +0000
++++ libvirt-0.6.0.new/src/qemu_driver.c	2009-02-18 11:15:37.000000000 +0000
+@@ -633,6 +633,7 @@ qemudReadMonitorOutput(virConnectPtr con
+ {
+     int got = 0;
+     buf[0] = '\0';
++    timeout *= 1000; /* poll wants milli seconds */
+ 
+     /* Consume & discard the initial greeting */
+     while (got < (buflen-1)) {
+@@ -694,6 +695,56 @@ qemudReadMonitorOutput(virConnectPtr con
+ 
+ }
+ 
++
++/*
++ * Returns -1 for error, 0 on success
++ */
++static int
++qemudReadLogOutput(virConnectPtr conn,
++                   virDomainObjPtr vm,
++                   int fd,
++                   char *buf,
++                   int buflen,
++                   qemudHandlerMonitorOutput func,
++                   const char *what,
++                   int timeout)
++{
++    int got = 0;
++    int ret;
++    int retries = timeout*10;
++    buf[0] = '\0';
++
++    while (retries) {
++        while((ret = read(fd, buf+got, buflen-got-1)) > 0) {
++            got += ret;
++            buf[got] = '\0';
++            if ((buflen-got-1) == 0) {
++                qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
++                                 _("Out of space while reading %s log output"), what);
++                return -1;
++            }
++        }
++
++        if (ret < 0 && errno != EINTR) {
++            virReportSystemError(conn, errno,
++                                 _("Failure while reading %s log output"),
++                                 what);
++            return -1;
++        }
++
++        ret = func(conn, vm, buf, fd);
++        if (ret <= 0)
++            return ret;
++
++        usleep(100*1000);
++        retries--;
++    }
++    if (retries == 0)
++        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
++                         _("Timed out while reading %s log output"), what);
++    return -1;
++}
++
+ static int
+ qemudCheckMonitorPrompt(virConnectPtr conn ATTRIBUTE_UNUSED,
+                         virDomainObjPtr vm,
+@@ -738,7 +789,7 @@ static int qemudOpenMonitor(virConnectPt
+                                    vm, monfd,
+                                    buf, sizeof(buf),
+                                    qemudCheckMonitorPrompt,
+-                                   "monitor", 10000) <= 0)
++                                   "monitor", 10) <= 0)
+             ret = -1;
+         else
+             ret = 0;
+@@ -770,6 +821,7 @@ static int qemudOpenMonitor(virConnectPt
+     return ret;
+ }
+ 
++/* Returns -1 for error, 0 success, 1 continue reading */
+ static int qemudExtractMonitorPath(virConnectPtr conn,
+                                    const char *haystack,
+                                    size_t *offset,
+@@ -873,19 +925,16 @@ static int qemudWaitForMonitor(virConnec
+         < 0)
+         return -1;
+ 
+-    ret = qemudReadMonitorOutput(conn, vm, logfd, buf, sizeof(buf),
+-                                 qemudFindCharDevicePTYs,
+-                                 "console", 3000);
++    ret = qemudReadLogOutput(conn, vm, logfd, buf, sizeof(buf),
++                             qemudFindCharDevicePTYs,
++                             "console", 3);
+     if (close(logfd) < 0)
+         qemudLog(QEMUD_WARN, _("Unable to close logfile: %s\n"),
+                  strerror(errno));
+ 
+-    if (ret == 1) /* Success */
++    if (ret == 0) /* success */
+         return 0;
+ 
+-    if (ret == -1)
+-        return -1;
+-
+     /* Unexpected end of file - inform user of QEMU log data */
+     qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                      _("unable to start guest: %s"), buf);

libvirt-0.6.0-rpccall.patch

@@ -0,0 +1,70 @@
+diff -rup libvirt-0.6.0.orig/qemud/event.c libvirt-0.6.0.new/qemud/event.c
+--- libvirt-0.6.0.orig/qemud/event.c	2009-02-06 19:30:58.000000000 +0000
++++ libvirt-0.6.0.new/qemud/event.c	2009-02-06 19:30:00.000000000 +0000
+@@ -657,6 +657,8 @@ virPollEventToEventHandleType(int events
+         ret |= VIR_EVENT_HANDLE_WRITABLE;
+     if(events & POLLERR)
+         ret |= VIR_EVENT_HANDLE_ERROR;
++    if(events & POLLNVAL) /* Treat NVAL as error, since libvirt doesn't distinguish */
++        ret |= VIR_EVENT_HANDLE_ERROR;
+     if(events & POLLHUP)
+         ret |= VIR_EVENT_HANDLE_HANGUP;
+     return ret;
+diff -rup libvirt-0.6.0.orig/src/domain_conf.c libvirt-0.6.0.new/src/domain_conf.c
+--- libvirt-0.6.0.orig/src/domain_conf.c	2009-01-31 09:04:17.000000000 +0000
++++ libvirt-0.6.0.new/src/domain_conf.c	2009-02-06 19:30:00.000000000 +0000
+@@ -504,6 +504,7 @@ virDomainObjPtr virDomainAssignDef(virCo
+     domain->state = VIR_DOMAIN_SHUTOFF;
+     domain->def = def;
+     domain->monitor_watch = -1;
++    domain->monitor = -1;
+ 
+     if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) {
+         virReportOOMError(conn);
+diff -rup libvirt-0.6.0.orig/src/remote_internal.c libvirt-0.6.0.new/src/remote_internal.c
+--- libvirt-0.6.0.orig/src/remote_internal.c	2009-01-31 09:04:18.000000000 +0000
++++ libvirt-0.6.0.new/src/remote_internal.c	2009-02-06 19:30:00.000000000 +0000
+@@ -6198,17 +6198,17 @@ processCalls(virConnectPtr conn,
+                 continue;
+             virReportSystemError(in_open ? NULL : conn, errno,
+                                  "%s", _("poll on socket failed"));
+-            return -1;
++            goto error;
+         }
+ 
+         if (fds[0].revents & POLLOUT) {
+             if (processCallSend(conn, priv, in_open) < 0)
+-                return -1;
++                goto error;
+         }
+ 
+         if (fds[0].revents & POLLIN) {
+             if (processCallRecv(conn, priv, in_open) < 0)
+-                return -1;
++                goto error;
+         }
+ 
+         /* Iterate through waiting threads and if
+@@ -6259,9 +6259,21 @@ processCalls(virConnectPtr conn,
+         if (fds[0].revents & (POLLHUP | POLLERR)) {
+             errorf(in_open ? NULL : conn, VIR_ERR_INTERNAL_ERROR,
+                    "%s", _("received hangup / error event on socket"));
+-            return -1;
++            goto error;
+         }
+     }
++
++
++error:
++    priv->waitDispatch = thiscall->next;
++    DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch);
++    /* See if someone else is still waiting
++     * and if so, then pass the buck ! */
++    if (priv->waitDispatch) {
++        DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch);
++        virCondSignal(&priv->waitDispatch->cond);
++    }
++    return -1;
+ }
+ 
+ /*

libvirt.spec

@@ -47,16 +47,18 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.0
-Release: 2%{?dist}%{?extra_release}
+Release: 5%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
 Patch1: %{name}-%{version}-timeout.patch
-Patch2: %{name}-%{version}-rpccall2.patch
+Patch2: %{name}-%{version}-rpccall.patch
+Patch3: %{name}-%{version}-qemu-startup.patch
+Patch4: %{name}-%{version}-dbus-threads.patch
+Patch5: %{name}-%{version}-autostart-timeout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
-Requires: libxml2
 Requires: readline
 Requires: ncurses
 Requires: dnsmasq
@@ -140,7 +142,8 @@ BuildRequires: iscsi-initiator-utils
 BuildRequires: parted-devel
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
-Obsoletes: libvir
+Obsoletes: libvir <= 0.2
+Provides: libvir = %{version}-%{release}
 
 # Fedora build root suckage
 BuildRequires: gawk
@@ -152,12 +155,13 @@ of recent versions of Linux (and other OSes).
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}
+Requires: libvirt = %{version}-%{release}
 Requires: pkgconfig
 %if %{with_xen}
 Requires: xen-devel
 %endif
-Obsoletes: libvir-devel
+Obsoletes: libvir-devel <= 0.2
+Provides: libvir-devel = %{version}-%{release}
 
 %description devel
 Includes and documentations for the C library providing an API to use
@@ -167,8 +171,9 @@ the virtualization capabilities of recent versions of Linux (and other OSes).
 %package python
 Summary: Python bindings for the libvirt library
 Group: Development/Libraries
-Requires: libvirt = %{version}
-Obsoletes: libvir-python
+Requires: libvirt = %{version}-%{release}
+Obsoletes: libvir-python <= 0.2
+Provides: libvir-python = %{version}-%{release}
 
 %description python
 The libvirt-python package contains a module that permits applications
@@ -181,6 +186,12 @@ of recent versions of Linux (and other OSes).
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+mv NEWS NEWS.old
+iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
 
 %build
 %if ! %{with_xen}
@@ -249,7 +260,7 @@ of recent versions of Linux (and other OSes).
 make %{?_smp_mflags}
 
 %install
-rm -fr %{buildroot}
+rm -rf %{buildroot}
 
 %makeinstall
 (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
@@ -291,6 +302,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
 %endif
 
+%if %{with_libvirtd}
+chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd
+%endif
+
 %clean
 rm -fr %{buildroot}
 
@@ -324,8 +339,7 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -463,12 +477,23 @@ fi
 %endif
 
 %changelog
-* Fri Feb  6 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-2.fc10
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 18 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-4.fc11
+- Fix QEMU startup timeout/race (rhbz #484649)
+- Setup DBus threading. Don't allow dbus to call _exit / change SIGPIPE (rhbz #484553)
+- Fix timeout when autostarting session daemon
+
+* Wed Feb 11 2009 Richard W.M. Jones <rjones@redhat.com> - 0.6.0-3.fc11
+- Multiple fixes to remove rpmlint warnings/errors (rhbz #226055)
+
+* Fri Feb  6 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-2.fc11
 - Fix libvirtd --timeout usage
 - Fix RPC call problems and QEMU startup handling (rhbz #484414)
 - Fix unowned directories (rhbz #483442)
 
-* Sat Jan 31 2009 Daniel Veillard <veillard@redhat.com> - 0.6.0-1.fc10
+* Sat Jan 31 2009 Daniel Veillard <veillard@redhat.com> - 0.6.0-1.fc11
 - upstream release 0.6.0
 - thread safety of API
 - allow QEmu/KVM domains to survive daemon restart
@@ -477,15 +502,18 @@ fi
 - support of storage cache control options for QEmu/KVM
 - a lot of bug fixes
 
-* Wed Dec 17 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-2.fc10
+* Wed Dec 17 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-2.fc11
 - fix missing read-only access checks, fixes CVE-2008-5086
 
-* Fri Dec  5 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-1.fc10
+* Fri Dec  5 2008 Daniel Veillard <veillard@redhat.com> - 0.5.1-1.fc11
 - upstream release 0.5.1
 - mostly bugfixes e.g #473071
 - some driver improvments
 
-* Wed Nov 26 2008 Daniel Veillard <veillard@redhat.com> - 0.5.0-1.fc10
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.5.0-2
+- Rebuild for Python 2.6
+
+* Wed Nov 26 2008 Daniel Veillard <veillard@redhat.com> - 0.5.0-1.fc11
 - upstream release 0.5.0
 - domain lifecycle event support
 - node device enumeration
@@ -528,7 +556,7 @@ fi
 
 * Wed Jun  4 2008 Mark McLoughlin <markmc@redhat.com> - 0.4.2-6.fc10
 - Disable lokkit support again (#449996, #447633)
-- Ensure %{fedora} is evaluated correctly
+- Ensure %-fedora is evaluated correctly
 
 * Thu May 15 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-5.fc10
 - Rebuild with policy enabled (rhbz #446616)
@@ -713,7 +741,7 @@ fi
 - it's pkgconfig not pgkconfig !
 
 * Mon Nov  6 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-2
-- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel
+- fixing spec file, added %-dist, -devel requires pkgconfig and xen-devel
 - Resolves: rhbz#202320
 
 * Mon Oct 16 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-1