From 25ea2f59bd15af2375583f6c7f89cf80019e06f8 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@fedoraproject.org>
Date: Feb 06 2009 19:36:12 +0000
Subject: Fix patches to be -p1 not -p0


---

diff --git a/libvirt-0.6.0-rpccall.patch b/libvirt-0.6.0-rpccall.patch
index 23a3e3d..75b9240 100644
--- a/libvirt-0.6.0-rpccall.patch
+++ b/libvirt-0.6.0-rpccall.patch
@@ -1,12 +1,7 @@
-? mingw-fixes
-Index: qemud/event.c
-===================================================================
-RCS file: /data/cvs/libvirt/qemud/event.c,v
-retrieving revision 1.17
-diff -u -p -u -p -r1.17 event.c
---- qemud/event.c	22 Dec 2008 12:55:47 -0000	1.17
-+++ qemud/event.c	5 Feb 2009 17:12:51 -0000
-@@ -653,6 +653,8 @@ virPollEventToEventHandleType(int events
+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;
@@ -15,13 +10,9 @@ diff -u -p -u -p -r1.17 event.c
      if(events & POLLHUP)
          ret |= VIR_EVENT_HANDLE_HANGUP;
      return ret;
-Index: src/domain_conf.c
-===================================================================
-RCS file: /data/cvs/libvirt/src/domain_conf.c,v
-retrieving revision 1.64
-diff -u -p -u -p -r1.64 domain_conf.c
---- src/domain_conf.c	30 Jan 2009 21:52:22 -0000	1.64
-+++ src/domain_conf.c	5 Feb 2009 17:12:51 -0000
+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;
@@ -30,14 +21,10 @@ diff -u -p -u -p -r1.64 domain_conf.c
  
      if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) {
          virReportOOMError(conn);
-Index: src/remote_internal.c
-===================================================================
-RCS file: /data/cvs/libvirt/src/remote_internal.c,v
-retrieving revision 1.136
-diff -u -p -u -p -r1.136 remote_internal.c
---- src/remote_internal.c	3 Feb 2009 13:08:07 -0000	1.136
-+++ src/remote_internal.c	5 Feb 2009 17:12:52 -0000
-@@ -6192,17 +6192,17 @@ processCalls(virConnectPtr 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"));
@@ -58,7 +45,7 @@ diff -u -p -u -p -r1.136 remote_internal.c
          }
  
          /* Iterate through waiting threads and if
-@@ -6253,9 +6253,21 @@ processCalls(virConnectPtr conn,
+@@ -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"));
diff --git a/libvirt-0.6.0-timeout.patch b/libvirt-0.6.0-timeout.patch
index ac753bc..02dcc53 100644
--- a/libvirt-0.6.0-timeout.patch
+++ b/libvirt-0.6.0-timeout.patch
@@ -1,10 +1,6 @@
-Index: qemud/event.c
-===================================================================
-RCS file: /data/cvs/libvirt/qemud/event.c,v
-retrieving revision 1.17
-diff -u -p -u -r1.17 event.c
---- qemud/event.c	22 Dec 2008 12:55:47 -0000	1.17
-+++ qemud/event.c	4 Feb 2009 15:08:06 -0000
+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	2008-12-22 13:02:54.000000000 +0000
++++ libvirt-0.6.0.new/qemud/event.c	2009-02-06 19:29:28.000000000 +0000
 @@ -68,6 +68,7 @@ struct virEventTimeout {
  /* State for the main event loop */
  struct virEventLoop {
@@ -41,13 +37,9 @@ diff -u -p -u -r1.17 event.c
          return 0;
  
      if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c))
-Index: qemud/qemud.c
-===================================================================
-RCS file: /data/cvs/libvirt/qemud/qemud.c,v
-retrieving revision 1.138
-diff -u -p -u -r1.138 qemud.c
---- qemud/qemud.c	28 Jan 2009 11:31:39 -0000	1.138
-+++ qemud/qemud.c	4 Feb 2009 15:08:06 -0000
+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-01-31 09:04:17.000000000 +0000
++++ libvirt-0.6.0.new/qemud/qemud.c	2009-02-06 19:29:28.000000000 +0000
 @@ -2013,11 +2013,15 @@ static int qemudOneLoop(void) {
      return 0;
  }