Fix patches to be -p1 not -p0

Fix RPC call problems and QEMU startup handling (rhbz #484414)
Fix unowned directories (rhbz #483442)

.cvsignore

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

branch

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

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

@@ -52,7 +52,7 @@ 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python python-devel
@@ -463,12 +463,12 @@ fi
 %endif
 
 %changelog
-* Fri Feb  6 2009 Daniel P. Berrange <berrange@redhat.com> - 0.6.0-2.fc10
+* 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 +477,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