[Pkg-libvirt-commits] [libvirt] 03/04: Rediff patches

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1.2.9-1
in repository libvirt.

commit 0f86acd98e4457f9da9b613ef611cc5fa5ea3638
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Oct 2 07:24:08 2014 +0200

    Rediff patches
---
 .../qemu-use-systemd-s-TerminateMachine-to-kill-all-proc.patch      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/qemu-use-systemd-s-TerminateMachine-to-kill-all-proc.patch b/debian/patches/qemu-use-systemd-s-TerminateMachine-to-kill-all-proc.patch
index a801d48..e51a080 100644
--- a/debian/patches/qemu-use-systemd-s-TerminateMachine-to-kill-all-proc.patch
+++ b/debian/patches/qemu-use-systemd-s-TerminateMachine-to-kill-all-proc.patch
@@ -83,10 +83,10 @@ index 8a2c723..4a4f22c 100644
  
  #endif /* __QEMU_CGROUP_H__ */
 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 1b8931e..e1a4218 100644
+index 11eeb3c..712a25e 100644
 --- a/src/qemu/qemu_process.c
 +++ b/src/qemu/qemu_process.c
-@@ -4138,7 +4138,7 @@ int qemuProcessStart(virConnectPtr conn,
+@@ -4143,7 +4143,7 @@ int qemuProcessStart(virConnectPtr conn,
      /* Ensure no historical cgroup for this VM is lying around bogus
       * settings */
      VIR_DEBUG("Ensuring no historical cgroup is lying around");
@@ -95,7 +95,7 @@ index 1b8931e..e1a4218 100644
  
      for (i = 0; i < vm->def->ngraphics; ++i) {
          virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
-@@ -4916,7 +4916,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
+@@ -4921,7 +4921,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
      }
  
   retry:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git