Rediff patches

debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch

@@ -39,7 +39,7 @@ index f954599..4dd2abb 100644
    </define>
  
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 30a14e7..e425e15 100644
+index b0b9672..30f67a6 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2142,11 +2142,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,

debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch

@@ -10,10 +10,10 @@ Closes: #663931
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 95d1ff9..a675b9e 100644
+index 50faf2b..6361d40 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1473,7 +1473,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
+@@ -1484,7 +1484,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
  void virFileWaitForDevices(void)
  {
  # ifdef UDEVADM

debian/patches/debian/Don-t-enable-default-network-on-boot.patch

@@ -9,10 +9,10 @@ to not interfere with existing network configurations
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 047d4c6..b97c9ae 100644
+index 982f63d..9f347c0 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -2664,9 +2664,6 @@ if WITH_NETWORK
+@@ -2666,9 +2666,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
@@ -23,10 +23,10 @@ index 047d4c6..b97c9ae 100644
  
  uninstall-local:: uninstall-init uninstall-systemd
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 97f9765..1e0b2e9 100644
+index e1ac7b9..efad053 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -10089,9 +10089,6 @@ install-data-local: install-init install-systemd
+@@ -10113,9 +10113,6 @@ install-data-local: install-init install-systemd
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }

debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch

@@ -12,7 +12,7 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 2e35edf..30a14e7 100644
+index 09aa1aa..b0b9672 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
 @@ -2146,7 +2146,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,

debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch

@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index fea484d..a916c76 100644
+index fc54a11..0ddc5a9 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
 @@ -1543,7 +1543,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,